updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -631,12 +631,10 @@ func sanitizeCollectionName(db string, coll string) string {
 }
 
 func (t *T) createTestClient() {
-	var clientOpts *options.ClientOptions
-	if t.clientOpts == nil {
+	clientOpts := t.clientOpts
+	if clientOpts == nil {
 		// default opts
 		clientOpts = options.Client().SetWriteConcern(MajorityWc).SetReadPreference(PrimaryRp)
-	} else {
-		clientOpts = options.MergeClientOptions(t.clientOpts)
 	}
 	// set ServerAPIOptions to latest version if required
 	if clientOpts.Deployment == nil && t.clientType != Mock && clientOpts.ServerAPIOptions == nil && testContext.requireAPIVersion {
@@ -728,8 +726,9 @@ func (t *T) createTestClient() {
 		t.Fatalf("error connecting client: %v", err)
 	}
 
-	clientOpts.AutoEncryptionOptions = nil
-	t.fpClient, err = mongo.NewClient(uriOpts, clientOpts)
+	fpOpts := options.MergeClientOptions(uriOpts, clientOpts)
+	fpOpts.AutoEncryptionOptions = nil
+	t.fpClient, err = mongo.NewClient(fpOpts)
 	if err != nil {
 		t.Fatalf("error creating client: %v", err)
 	}