Respond to PR feedback.

Author: matthewdale

mongo/integration/client_test.go

@@ -479,18 +479,17 @@ func TestClientStress(t *testing.T) {
 	// TODO: Enable with GODRIVER-2038.
 	t.Skip("TODO: Enable with GODRIVER-2038")
 
-	mtOpts := mtest.NewOptions().
-		MinServerVersion("3.6").
-		Topologies(mtest.ReplicaSet, mtest.Sharded, mtest.Single).
-		CreateClient(false)
+	testutil.Integration(t)
+
+	mtOpts := mtest.NewOptions().CreateClient(false)
 	mt := mtest.New(t, mtOpts)
 
 	// Test that a Client can recover from a massive traffic spike after the traffic spike is over.
 	mt.Run("Client recovers from traffic spike", func(mt *mtest.T) {
 		oid := primitive.NewObjectID()
 		doc := bson.D{{Key: "_id", Value: oid}, {Key: "key", Value: "value"}}
 		_, err := mt.Coll.InsertOne(context.Background(), doc)
-		assert.Nil(mt, err, "unexpected error inserting document: %v", err)
+		assert.Nil(mt, err, "InsertOne error: %v", err)
 
 		// findOne calls FindOne("_id": oid) on the given collection and with the given timeout. It
 		// returns any errors.
@@ -521,7 +520,7 @@ func TestClientStress(t *testing.T) {
 		for i := 0; i < 50; i++ {
 			start := time.Now()
 			err := findOne(mt.Coll, 10*time.Second)
-			assert.Nil(t, err, "unexpected error calling FindOne: %v", err)
+			assert.Nil(t, err, "FindOne error: %v", err)
 			duration := time.Since(start)
 			if duration > maxRTT {
 				maxRTT = duration
@@ -538,7 +537,7 @@ func TestClientStress(t *testing.T) {
 			mt.RunOpts(fmt.Sprintf("maxPoolSize %d", maxPoolSize), maxPoolSizeOpt, func(mt *mtest.T) {
 				doc := bson.D{{Key: "_id", Value: oid}, {Key: "key", Value: "value"}}
 				_, err := mt.Coll.InsertOne(context.Background(), doc)
-				assert.Nil(mt, err, "unexpected error inserting document: %v", err)
+				assert.Nil(mt, err, "InsertOne error: %v", err)
 
 				// Set the timeout to be 10x the maximum observed RTT. Use a minimum 10ms timeout to
 				// prevent spurious test failures due to extremely low timeouts.

x/mongo/driver/topology/polling_srv_records_test.go

@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/require"
+	"go.mongodb.org/mongo-driver/internal/testutil"
 	"go.mongodb.org/mongo-driver/internal/testutil/assert"
 	"go.mongodb.org/mongo-driver/mongo/address"
 	"go.mongodb.org/mongo-driver/mongo/description"
@@ -125,9 +126,8 @@ func compareHosts(t *testing.T, received []description.Server, expected []string
 }
 
 func TestPollingSRVRecordsSpec(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
+	testutil.Integration(t)
+
 	for _, tt := range srvPollingTests {
 		t.Run(tt.name, func(t *testing.T) {
 			cs, err := connstring.ParseAndValidate("mongodb+srv://test1.test.build.10gen.cc/?heartbeatFrequencyMS=100")
@@ -165,9 +165,8 @@ func TestPollingSRVRecordsSpec(t *testing.T) {
 }
 
 func TestPollSRVRecords(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
+	testutil.Integration(t)
+
 	t.Run("Not unknown or sharded topology", func(t *testing.T) {
 		cs, err := connstring.ParseAndValidate("mongodb+srv://test1.test.build.10gen.cc/?heartbeatFrequencyMS=100")
 		require.NoError(t, err, "Problem parsing the uri: %v", err)