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 {
@@ -227,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
@@ -628,13 +628,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 {
-		opts := *t.clientOpts
-		clientOpts = &opts
 	}
 	// set ServerAPIOptions to latest version if required
 	if clientOpts.Deployment == nil && t.clientType != Mock && clientOpts.ServerAPIOptions == nil && testContext.requireAPIVersion {
@@ -715,22 +712,23 @@ func (t *T) createTestClient() {
 			uriOpts = options.Client().ApplyURI(testContext.connString.Original)
 		}
 	}
+	t.clientOpts = options.MergeClientOptions(uriOpts, clientOpts)
 
 	var err error
 	// Pass in uriOpts first so clientOpts wins if there are any conflicting settings.
-	t.Client, err = mongo.NewClient(uriOpts, clientOpts)
+	t.Client, err = mongo.NewClient(t.clientOpts)
 	if err != nil {
 		t.Fatalf("error creating client: %v", err)
 	}
 	if err := t.Client.Connect(context.Background()); err != nil {
 		t.Fatalf("error connecting client: %v", err)
 	}
 
-	clientOpts.AutoEncryptionOptions = nil
-	t.fpClient, err = mongo.NewClient(uriOpts, clientOpts)
-	if err != nil {
-		t.Fatalf("error creating client: %v", err)
-	}
+	// clientOpts.AutoEncryptionOptions = nil
+	// t.fpClient, err = mongo.NewClient(uriOpts, clientOpts)
+	// if err != nil {
+	// 	t.Fatalf("error creating client: %v", err)
+	// }
 	// if err := t.fpClient.Connect(context.Background()); err != nil {
 	// 	t.Fatalf("error connecting client: %v", err)
 	// }