updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -176,10 +176,12 @@ func New(wrapped *testing.T, opts ...*Options) *T {
 
 	t := newT(wrapped, opts...)
 
+	t.fpClient = t.createTestClient()
+
 	// only create a client if it needs to be shared in sub-tests
 	// otherwise, a new client will be created for each subtest
 	if t.shareClient != nil && *t.shareClient {
-		t.createTestClient()
+		t.Client = t.createTestClient()
 	}
 
 	wrapped.Cleanup(t.cleanup)
@@ -229,10 +231,13 @@ func (t *T) RunOpts(name string, opts *Options, callback func(mt *T)) {
 		if sub.shareClient != nil && *sub.shareClient && sub.clientType == t.clientType {
 			sub.Client = t.Client
 		}
+		if sub.fpClient == nil {
+			sub.fpClient = sub.createTestClient()
+		}
 		// only create a client if not already set
 		if sub.Client == nil {
 			if sub.createClient == nil || *sub.createClient {
-				sub.createTestClient()
+				sub.Client = sub.createTestClient()
 			}
 		}
 		// create a collection for this test
@@ -406,10 +411,8 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 		t.clientOpts = opts
 	}
 
-	if len(t.failPointNames) == 0 {
-		_ = t.Client.Disconnect(context.Background())
-	}
-	t.createTestClient()
+	_ = t.Client.Disconnect(context.Background())
+	t.Client = t.createTestClient()
 	t.DB = t.Client.Database(t.dbName)
 	t.Coll = t.DB.Collection(t.collName, t.collOpts)
 
@@ -562,9 +565,6 @@ func (t *T) SetFailPoint(fp FailPoint) {
 		}
 	}
 
-	if t.fpClient == nil {
-		t.fpClient = t.Client
-	}
 	if err := SetFailPoint(fp, t.fpClient); err != nil {
 		t.Fatal(err)
 	}
@@ -576,9 +576,6 @@ func (t *T) SetFailPoint(fp FailPoint) {
 // the failpoint will appear in command monitoring channels. The fail point will be automatically disabled after this
 // test has run.
 func (t *T) SetFailPointFromDocument(fp bson.Raw) {
-	if t.fpClient == nil {
-		t.fpClient = t.Client
-	}
 	if err := SetRawFailPoint(fp, t.fpClient); err != nil {
 		t.Fatal(err)
 	}
@@ -595,16 +592,7 @@ func (t *T) TrackFailPoint(fpName string) {
 
 // ClearFailPoints disables all previously set failpoints for this test.
 func (t *T) ClearFailPoints() {
-	client := t.fpClient
-	if client == nil {
-		client = t.Client
-	} else {
-		defer func() {
-			// _ = t.fpClient.Disconnect(context.Background())
-			t.fpClient = nil
-		}()
-	}
-	db := client.Database("admin")
+	db := t.fpClient.Database("admin")
 	for _, fp := range t.failPointNames {
 		cmd := bson.D{
 			{"configureFailPoint", fp},
@@ -643,7 +631,7 @@ func sanitizeCollectionName(db string, coll string) string {
 	return coll
 }
 
-func (t *T) createTestClient() {
+func (t *T) createTestClient() *mongo.Client {
 	clientOpts := t.clientOpts
 	if clientOpts == nil {
 		// default opts
@@ -702,19 +690,20 @@ func (t *T) createTestClient() {
 		})
 	}
 
+	var client *mongo.Client
 	var err error
 	switch t.clientType {
 	case Pinned:
 		// pin to first mongos
 		pinnedHostList := []string{testContext.connString.Hosts[0]}
 		uriOpts := options.Client().ApplyURI(testContext.connString.Original).SetHosts(pinnedHostList)
-		t.Client, err = mongo.NewClient(uriOpts, clientOpts)
+		client, err = mongo.NewClient(uriOpts, clientOpts)
 	case Mock:
 		// clear pool monitor to avoid configuration error
 		clientOpts.PoolMonitor = nil
 		t.mockDeployment = newMockDeployment()
 		clientOpts.Deployment = t.mockDeployment
-		t.Client, err = mongo.NewClient(clientOpts)
+		client, err = mongo.NewClient(clientOpts)
 	case Proxy:
 		t.proxyDialer = newProxyDialer()
 		clientOpts.SetDialer(t.proxyDialer)
@@ -732,14 +721,15 @@ func (t *T) createTestClient() {
 		}
 
 		// Pass in uriOpts first so clientOpts wins if there are any conflicting settings.
-		t.Client, err = mongo.NewClient(uriOpts, clientOpts)
+		client, err = mongo.NewClient(uriOpts, clientOpts)
 	}
 	if err != nil {
 		t.Fatalf("error creating client: %v", err)
 	}
-	if err := t.Client.Connect(context.Background()); err != nil {
+	if err := client.Connect(context.Background()); err != nil {
 		t.Fatalf("error connecting client: %v", err)
 	}
+	return client
 }
 
 func (t *T) createTestCollection() {