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 {
@@ -176,17 +176,10 @@ 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)
-
 	// 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.fpClient = t.createTestClient(t.clientOpts)
-		t.Client = t.createTestClient(t.clientOpts)
+		t.createTestClient()
 	}
 
 	wrapped.Cleanup(t.cleanup)
@@ -209,7 +202,7 @@ 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.fpClient.Disconnect(context.Background())
 	_ = t.Client.Disconnect(context.Background())
 }
 
@@ -233,23 +226,15 @@ 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)
-		// }
 		// 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
 		if sub.Client == nil {
 			if sub.createClient == nil || *sub.createClient {
-				sub.fpClient = sub.createTestClient(sub.clientOpts)
-				sub.Client = sub.createTestClient(sub.clientOpts)
+				sub.createTestClient()
 			}
 		}
 		// create a collection for this test
@@ -274,7 +259,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.fpClient.Disconnect(context.Background())
+				// _ = sub.fpClient.Disconnect(context.Background())
 				_ = sub.Client.Disconnect(context.Background())
 			}
 			assert.Equal(sub, 0, sessions, "%v sessions checked out", sessions)
@@ -424,10 +409,9 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 		t.clientOpts = opts
 	}
 
-	_ = t.fpClient.Disconnect(context.Background())
+	// _ = t.fpClient.Disconnect(context.Background())
 	_ = t.Client.Disconnect(context.Background())
-	t.fpClient = t.createTestClient(t.clientOpts)
-	t.Client = t.createTestClient(t.clientOpts)
+	t.createTestClient()
 	t.DB = t.Client.Database(t.dbName)
 	t.Coll = t.DB.Collection(t.collName, t.collOpts)
 
@@ -619,8 +603,6 @@ 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.
@@ -648,10 +630,14 @@ func sanitizeCollectionName(db string, coll string) string {
 	return coll
 }
 
-func (t *T) createTestClient(clientOpts *options.ClientOptions) *mongo.Client {
-	if clientOpts == nil {
+func (t *T) createTestClient() {
+	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 {
@@ -706,20 +692,17 @@ func (t *T) createTestClient(clientOpts *options.ClientOptions) *mongo.Client {
 		})
 	}
 
-	var client *mongo.Client
-	var err error
+	var uriOpts *options.ClientOptions
 	switch t.clientType {
 	case Pinned:
 		// pin to first mongos
 		pinnedHostList := []string{testContext.connString.Hosts[0]}
-		uriOpts := options.Client().ApplyURI(testContext.connString.Original).SetHosts(pinnedHostList)
-		client, err = mongo.NewClient(uriOpts, clientOpts)
+		uriOpts = options.Client().ApplyURI(testContext.connString.Original).SetHosts(pinnedHostList)
 	case Mock:
 		// clear pool monitor to avoid configuration error
 		clientOpts.PoolMonitor = nil
 		t.mockDeployment = newMockDeployment()
 		clientOpts.Deployment = t.mockDeployment
-		client, err = mongo.NewClient(clientOpts)
 	case Proxy:
 		t.proxyDialer = newProxyDialer()
 		clientOpts.SetDialer(t.proxyDialer)
@@ -729,23 +712,21 @@ func (t *T) createTestClient(clientOpts *options.ClientOptions) *mongo.Client {
 	case Default:
 		// Use a different set of options to specify the URI because clientOpts may already have a URI or host seedlist
 		// specified.
-		var uriOpts *options.ClientOptions
 		if clientOpts.Deployment == nil {
 			// Only specify URI if the deployment is not set to avoid setting topology/server options along with the
 			// deployment.
 			uriOpts = options.Client().ApplyURI(testContext.connString.Original)
 		}
-
-		// Pass in uriOpts first so clientOpts wins if there are any conflicting settings.
-		client, err = mongo.NewClient(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)
 	if err != nil {
 		t.Fatalf("error creating client: %v", err)
 	}
-	if err := client.Connect(context.Background()); err != nil {
+	if err := t.Client.Connect(context.Background()); err != nil {
 		t.Fatalf("error connecting client: %v", err)
 	}
-	return client
 }
 
 func (t *T) createTestCollection() {