test: make race condition test part of the suite

gobuffalo · May 30, 2022 · ee31dce · ee31dce
1 parent bdc55e6
commit ee31dce
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/connection_instrumented_test.go b/connection_instrumented_test.go
@@ -3,12 +3,10 @@ package pop
 import (
 	"context"
 	"fmt"
-	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 	"os"
 	"strings"
 	"sync"
-	"testing"
 	"time"
 
 	"github.com/luna-duclos/instrumentedsql"
@@ -77,6 +75,8 @@ func testInstrumentedDriver(p *suite.Suite) {
 	deets.UseInstrumentedDriver = true
 	deets.InstrumentedDriverOptions = []instrumentedsql.Opt{instrumentedsql.WithLogger(checker)}
 
+	testInstrumentationRace(p, &deets)
+
 	c, err := NewConnection(&deets)
 	r.NoError(err)
 	r.NoError(c.Open())
@@ -103,10 +103,12 @@ func (s *CockroachSuite) Test_Instrumentation() {
 	testInstrumentedDriver(&s.Suite)
 }
 
-func Test_InstrumentationRace(t *testing.T) {
-	r := require.New(t)
+func testInstrumentationRace(p *suite.Suite, deets *ConnectionDetails) {
+	r := p.Require()
 	eg1, eg2 := errgroup.Group{}, errgroup.Group{}
 
+	r.True(deets.UseInstrumentedDriver)
+
 	tryInstrumentDriver := func(release chan struct{}) func() (err error) {
 		return func() (err error) {
 			defer func() {
@@ -116,10 +118,7 @@ func Test_InstrumentationRace(t *testing.T) {
 				}
 			}()
 			_, _, err = instrumentDriver(
-				&ConnectionDetails{
-					URL:                   "postgres://foo.bar",
-					UseInstrumentedDriver: true,
-				},
+				deets,
 				"postgres",
 				release,
 			)