updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -128,9 +128,10 @@ type T struct {
 	succeeded   []*event.CommandSucceededEvent
 	failed      []*event.CommandFailedEvent
 
-	Client *mongo.Client
-	DB     *mongo.Database
-	Coll   *mongo.Collection
+	Client   *mongo.Client
+	fpClient *mongo.Client
+	DB       *mongo.Database
+	Coll     *mongo.Collection
 }
 
 func newT(wrapped *testing.T, opts ...*Options) *T {
@@ -405,7 +406,9 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 		t.clientOpts = opts
 	}
 
-	_ = t.Client.Disconnect(context.Background())
+	if len(t.failPointNames) == 0 {
+		_ = t.Client.Disconnect(context.Background())
+	}
 	t.createTestClient()
 	t.DB = t.Client.Database(t.dbName)
 	t.Coll = t.DB.Collection(t.collName, t.collOpts)
@@ -559,7 +562,10 @@ func (t *T) SetFailPoint(fp FailPoint) {
 		}
 	}
 
-	if err := SetFailPoint(fp, t.Client); err != nil {
+	if t.fpClient == nil {
+		t.fpClient = t.Client
+	}
+	if err := SetFailPoint(fp, t.fpClient); err != nil {
 		t.Fatal(err)
 	}
 	t.failPointNames = append(t.failPointNames, fp.ConfigureFailPoint)
@@ -570,7 +576,10 @@ 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 err := SetRawFailPoint(fp, t.Client); err != nil {
+	if t.fpClient == nil {
+		t.fpClient = t.Client
+	}
+	if err := SetRawFailPoint(fp, t.fpClient); err != nil {
 		t.Fatal(err)
 	}
 
@@ -586,7 +595,16 @@ func (t *T) TrackFailPoint(fpName string) {
 
 // ClearFailPoints disables all previously set failpoints for this test.
 func (t *T) ClearFailPoints() {
-	db := t.Client.Database("admin")
+	client := t.fpClient
+	if client == nil {
+		client = t.Client
+	} else {
+		defer func() {
+			// _ = t.fpClient.Disconnect(context.Background())
+			t.fpClient = nil
+		}()
+	}
+	db := client.Database("admin")
 	for _, fp := range t.failPointNames {
 		cmd := bson.D{
 			{"configureFailPoint", fp},