Merge pull request #2116 from matthewdale/fix-test-short-2

Prevent integration tests from running when testing with -short

Author: matthewdale

internal/integtest/integtest.go

@@ -223,6 +223,10 @@ func AddServerlessAuthCredentials(uri string) (string, error) {
 
 // ConnString gets the globally configured connection string.
 func ConnString(t *testing.T) *connstring.ConnString {
+	if testing.Short() {
+		t.Skip("skipping integration test in short mode")
+	}
+
 	connectionStringOnce.Do(func() {
 		uri, err := MongoDBURI()
 		require.NoError(t, err, "error constructing mongodb URI: %v", err)

x/mongo/driver/topology/server_test.go

@@ -130,6 +130,9 @@ func (d *timeoutDialer) DialContext(ctx context.Context, network, address string
 
 // TestServerHeartbeatTimeout tests timeout retry and preemptive canceling.
 func TestServerHeartbeatTimeout(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test in short mode")
+	}
 	if os.Getenv("DOCKER_RUNNING") != "" {
 		t.Skip("Skipping this test in docker.")
 	}