updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -176,12 +176,14 @@ func New(wrapped *testing.T, opts ...*Options) *T {
 
 	t := newT(wrapped, opts...)
 
-	t.fpClient = t.createTestClient()
+	fpOpt := t.clientOpts
+	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.Client = t.createTestClient()
+		t.Client = t.createTestClient(t.clientOpts)
 	}
 
 	wrapped.Cleanup(t.cleanup)
@@ -237,7 +239,7 @@ func (t *T) RunOpts(name string, opts *Options, callback func(mt *T)) {
 		// only create a client if not already set
 		if sub.Client == nil {
 			if sub.createClient == nil || *sub.createClient {
-				sub.Client = sub.createTestClient()
+				sub.Client = sub.createTestClient(t.clientOpts)
 			}
 		}
 		// create a collection for this test
@@ -412,7 +414,7 @@ func (t *T) ResetClient(opts *options.ClientOptions) {
 	}
 
 	_ = t.Client.Disconnect(context.Background())
-	t.Client = t.createTestClient()
+	t.Client = t.createTestClient(t.clientOpts)
 	t.DB = t.Client.Database(t.dbName)
 	t.Coll = t.DB.Collection(t.collName, t.collOpts)
 
@@ -631,8 +633,7 @@ func sanitizeCollectionName(db string, coll string) string {
 	return coll
 }
 
-func (t *T) createTestClient() *mongo.Client {
-	clientOpts := t.clientOpts
+func (t *T) createTestClient(clientOpts *options.ClientOptions) *mongo.Client {
 	if clientOpts == nil {
 		// default opts
 		clientOpts = options.Client().SetWriteConcern(MajorityWc).SetReadPreference(PrimaryRp)