Respond to PR feedback.

Author: matthewdale

internal/testutil/config.go

@@ -318,15 +318,6 @@ func GetDBName(cs connstring.ConnString) string {
 	return fmt.Sprintf("mongo-go-driver-%d", os.Getpid())
 }
 
-// Integration should be called at the beginning of integration
-// tests to ensure that they are skipped if integration testing is
-// turned off.
-func Integration(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-}
-
 // compareVersions compares two version number strings (i.e. positive integers separated by
 // periods). Comparisons are done to the lesser precision of the two versions. For example, 3.2 is
 // considered equal to 3.2.11, whereas 3.2.0 is considered less than 3.2.11.

mongo/integration/client_test.go

@@ -479,18 +479,19 @@ 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)
+	if testing.Short() {
+		t.Skip("skipping integration test in short mode")
+	}
+
+	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 +522,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 +539,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.