updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -176,16 +176,17 @@ func New(wrapped *testing.T, opts ...*Options) *T {
 
 	t := newT(wrapped, opts...)
 
-	fpOpt := t.clientOpts
-	if fpOpt != nil {
-		fpOpt.AutoEncryptionOptions = nil
-	}
-	t.fpClient = t.createTestClient(fpOpt)
+	// fpOpt := t.clientOpts
+	// if fpOpt != nil {
+	// 	fpOpt.AutoEncryptionOptions = nil
+	// }
+	// t.fpClient = t.createTestClient(fpOpt)
 
 	// 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.Client = t.createTestClient(t.clientOpts)
+		t.fpClient = t.createTestClient(t.clientOpts)
 	}
 
 	wrapped.Cleanup(t.cleanup)
@@ -209,6 +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())
 }
 
 // Run creates a new T instance for a sub-test and runs the given callback. It also creates a new collection using the
@@ -231,21 +233,23 @@ func (t *T) RunOpts(name string, opts *Options, callback func(mt *T)) {
 			sub.AddMockResponses(sub.mockResponses...)
 		}
 
-		if sub.fpClient == nil {
-			clientOpts := sub.clientOpts
-			if clientOpts != nil {
-				clientOpts.AutoEncryptionOptions = nil
-			}
-			sub.fpClient = sub.createTestClient(clientOpts)
-		}
+		// if sub.fpClient == nil {
+		// 	clientOpts := sub.clientOpts
+		// 	if clientOpts != nil {
+		// 		clientOpts.AutoEncryptionOptions = nil
+		// 	}
+		// 	sub.fpClient = sub.createTestClient(clientOpts)
+		// }
 		// 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
 		}
 		// 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)
 			}
 		}
 		// create a collection for this test
@@ -271,6 +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())
 			}
 			assert.Equal(sub, 0, sessions, "%v sessions checked out", sessions)
 			assert.Equal(sub, 0, conns, "%v connections checked out", conns)
@@ -612,6 +617,8 @@ func (t *T) ClearFailPoints() {
 		}
 	}
 	t.failPointNames = t.failPointNames[:0]
+	// t.fpClient.Disconnect(context.Background())
+	// t.fpClient = nil
 }
 
 // CloneDatabase modifies the default database for this test to match the given options.