updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -588,22 +588,26 @@ func (t *T) TrackFailPoint(fpName string) {
 
 // ClearFailPoints disables all previously set failpoints for this test.
 func (t *T) ClearFailPoints() {
-	clientOpts := *t.clientOpts
-	clientOpts.AutoEncryptionOptions = nil
-	client, err := mongo.NewClient(&clientOpts)
-	if err != nil {
-		t.Fatalf("error creating client: %v", err)
+	var err error
+	client := t.Client
+	if t.clientOpts.AutoEncryptionOptions != nil {
+		clientOpts := *t.clientOpts
+		clientOpts.AutoEncryptionOptions = nil
+		client, err = mongo.NewClient(&clientOpts)
+		if err != nil {
+			t.Fatalf("error creating client: %v", err)
+		}
+		defer func() {
+			_ = client.Disconnect(context.Background())
+		}()
 	}
-	defer func() {
-		_ = client.Disconnect(context.Background())
-	}()
 	db := client.Database("admin")
 	for _, fp := range t.failPointNames {
 		cmd := bson.D{
 			{"configureFailPoint", fp},
 			{"mode", "off"},
 		}
-		err := db.RunCommand(context.Background(), cmd).Err()
+		err = db.RunCommand(context.Background(), cmd).Err()
 		if err != nil {
 			t.Fatalf("error clearing fail point %s: %v", fp, err)
 		}