updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -202,7 +202,6 @@ func (t *T) cleanup() {
 
 	// always disconnect the client regardless of clientType because Client.Disconnect will work against
 	// all deployments
-	// _ = t.fpClient.Disconnect(context.Background())
 	_ = t.Client.Disconnect(context.Background())
 }
 
@@ -228,7 +227,7 @@ 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.fpClient = t.fpClient
+			sub.fpClient = t.fpClient
 			sub.Client = t.Client
 		}
 		// only create a client if not already set
@@ -259,7 +258,6 @@ 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.fpClient.Disconnect(context.Background())
 				_ = sub.Client.Disconnect(context.Background())
 			}
 			assert.Equal(sub, 0, sessions, "%v sessions checked out", sessions)
@@ -409,7 +407,6 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 		t.clientOpts = opts
 	}
 
-	// _ = t.fpClient.Disconnect(context.Background())
 	_ = t.Client.Disconnect(context.Background())
 	t.createTestClient()
 	t.DB = t.Client.Database(t.dbName)
@@ -631,10 +628,13 @@ func sanitizeCollectionName(db string, coll string) string {
 }
 
 func (t *T) createTestClient() {
-	clientOpts := t.clientOpts
-	if clientOpts == nil {
+	var clientOpts *options.ClientOptions
+	if t.clientOpts == nil {
 		// default opts
 		clientOpts = options.Client().SetWriteConcern(MajorityWc).SetReadPreference(PrimaryRp)
+	} else {
+		opts := *t.clientOpts
+		clientOpts = &opts
 	}
 	// set ServerAPIOptions to latest version if required
 	if clientOpts.Deployment == nil && t.clientType != Mock && clientOpts.ServerAPIOptions == nil && testContext.requireAPIVersion {
@@ -726,9 +726,8 @@ func (t *T) createTestClient() {
 		t.Fatalf("error connecting client: %v", err)
 	}
 
-	fpOpts := options.MergeClientOptions(uriOpts, clientOpts)
-	fpOpts.AutoEncryptionOptions = nil
-	t.fpClient, err = mongo.NewClient(fpOpts)
+	clientOpts.AutoEncryptionOptions = nil
+	t.fpClient, err = mongo.NewClient(uriOpts, clientOpts)
 	if err != nil {
 		t.Fatalf("error creating client: %v", err)
 	}