updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -185,8 +185,8 @@ func New(wrapped *testing.T, opts ...*Options) *T {
 	// 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)
+		t.Client = t.createTestClient(t.clientOpts)
 	}
 
 	wrapped.Cleanup(t.cleanup)
@@ -209,8 +209,8 @@ 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())
+	_ = t.Client.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
@@ -242,14 +242,14 @@ 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.Client = t.Client
 			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.Client = sub.createTestClient(sub.clientOpts)
 				sub.fpClient = sub.createTestClient(sub.clientOpts)
+				sub.Client = sub.createTestClient(sub.clientOpts)
 			}
 		}
 		// create a collection for this test
@@ -274,8 +274,8 @@ 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())
+				_ = sub.Client.Disconnect(context.Background())
 			}
 			assert.Equal(sub, 0, sessions, "%v sessions checked out", sessions)
 			assert.Equal(sub, 0, conns, "%v connections checked out", conns)
@@ -424,10 +424,10 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 		t.clientOpts = opts
 	}
 
-	_ = t.Client.Disconnect(context.Background())
 	_ = t.fpClient.Disconnect(context.Background())
-	t.Client = t.createTestClient(t.clientOpts)
+	_ = t.Client.Disconnect(context.Background())
 	t.fpClient = t.createTestClient(t.clientOpts)
+	t.Client = t.createTestClient(t.clientOpts)
 	t.DB = t.Client.Database(t.dbName)
 	t.Coll = t.DB.Collection(t.collName, t.collOpts)