updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -128,10 +128,10 @@ type T struct {
 	succeeded   []*event.CommandSucceededEvent
 	failed      []*event.CommandFailedEvent
 
-	Client *mongo.Client
-	// fpClient *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 {
@@ -186,7 +186,7 @@ func New(wrapped *testing.T, opts ...*Options) *T {
 	// otherwise, a new client will be created for each subtest
 	if t.shareClient != nil && *t.shareClient {
 		t.Client = t.createTestClient(t.clientOpts)
-		// t.fpClient = t.createTestClient(t.clientOpts)
+		t.fpClient = t.createTestClient(t.clientOpts)
 	}
 
 	wrapped.Cleanup(t.cleanup)
@@ -210,7 +210,7 @@ func (t *T) cleanup() {
 	// always disconnect the client regardless of clientType because Client.Disconnect will work against
 	// all deployments
 	_ = t.Client.Disconnect(context.Background())
-	// _ = t.fpClient.Disconnect(context.Background())
+	_ = t.fpClient.Disconnect(context.Background())
 }
 
 // Run creates a new T instance for a sub-test and runs the given callback. It also creates a new collection using the
@@ -243,13 +243,13 @@ func (t *T) RunOpts(name string, opts *Options, callback func(mt *T)) {
 		// for shareClient, inherit the client from the parent
 		if sub.shareClient != nil && *sub.shareClient && sub.clientType == t.clientType {
 			sub.Client = t.Client
-			// sub.fpClient = t.fpClient
+			sub.fpClient = t.fpClient
 		}
 		// only create a client if not already set
 		if sub.Client == nil {
 			if sub.createClient == nil || *sub.createClient {
 				sub.Client = sub.createTestClient(sub.clientOpts)
-				// sub.fpClient = sub.createTestClient(sub.clientOpts)
+				sub.fpClient = sub.createTestClient(sub.clientOpts)
 			}
 		}
 		// create a collection for this test
@@ -275,7 +275,7 @@ func (t *T) RunOpts(name string, opts *Options, callback func(mt *T)) {
 			// only disconnect client if it's not being shared
 			if sub.shareClient == nil || !*sub.shareClient {
 				_ = sub.Client.Disconnect(context.Background())
-				// _ = sub.fpClient.Disconnect(context.Background())
+				_ = sub.fpClient.Disconnect(context.Background())
 			}
 			assert.Equal(sub, 0, sessions, "%v sessions checked out", sessions)
 			assert.Equal(sub, 0, conns, "%v connections checked out", conns)
@@ -425,9 +425,9 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 	}
 
 	_ = t.Client.Disconnect(context.Background())
-	// _ = t.fpClient.Disconnect(context.Background())
+	_ = t.fpClient.Disconnect(context.Background())
 	t.Client = t.createTestClient(t.clientOpts)
-	// t.fpClient = t.createTestClient(t.clientOpts)
+	t.fpClient = t.createTestClient(t.clientOpts)
 	t.DB = t.Client.Database(t.dbName)
 	t.Coll = t.DB.Collection(t.collName, t.collOpts)
 
@@ -607,12 +607,7 @@ func (t *T) TrackFailPoint(fpName string) {
 
 // ClearFailPoints disables all previously set failpoints for this test.
 func (t *T) ClearFailPoints() {
-	clientOpts := t.clientOpts
-	if clientOpts != nil {
-		clientOpts.AutoEncryptionOptions = nil
-	}
-	client := t.createTestClient(clientOpts)
-	db := client.Database("admin")
+	db := t.Client.Database("admin")
 	for _, fp := range t.failPointNames {
 		cmd := bson.D{
 			{"configureFailPoint", fp},