updates

Author: qingyang-hu

mongo/integration/mtest/mongotest.go

@@ -84,6 +84,11 @@ type WriteConcernErrorData struct {
 	ErrInfo     bson.Raw  `bson:"errInfo,omitempty"`
 }
 
+type failPoint struct {
+	name       string
+	clientOpts *options.ClientOptions
+}
+
 // T is a wrapper around testing.T.
 type T struct {
 	// connsCheckedOut is the net number of connections checked out during test execution.
@@ -103,7 +108,7 @@ type T struct {
 	createdColls      []*Collection // collections created in this test
 	proxyDialer       *proxyDialer
 	dbName, collName  string
-	failPointNames    []string
+	failPointNames    []failPoint
 	minServerVersion  string
 	maxServerVersion  string
 	validTopologies   []TopologyKind
@@ -129,9 +134,8 @@ type T struct {
 	failed      []*event.CommandFailedEvent
 
 	Client *mongo.Client
-	// fpClient *mongo.Client
-	DB   *mongo.Database
-	Coll *mongo.Collection
+	DB     *mongo.Database
+	Coll   *mongo.Collection
 }
 
 func newT(wrapped *testing.T, opts ...*Options) *T {
@@ -227,7 +231,6 @@ 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.Client = t.Client
 		}
 		// only create a client if not already set
@@ -564,7 +567,8 @@ func (t *T) SetFailPoint(fp FailPoint) {
 	if err := SetFailPoint(fp, t.Client); err != nil {
 		t.Fatal(err)
 	}
-	t.failPointNames = append(t.failPointNames, fp.ConfigureFailPoint)
+	clientOpts := *t.clientOpts
+	t.failPointNames = append(t.failPointNames, failPoint{fp.ConfigureFailPoint, &clientOpts})
 }
 
 // SetFailPointFromDocument sets the fail point represented by the given document for the client associated with T. This
@@ -577,23 +581,21 @@ func (t *T) SetFailPointFromDocument(fp bson.Raw) {
 	}
 
 	name := fp.Index(0).Value().StringValue()
-	t.failPointNames = append(t.failPointNames, name)
+	clientOpts := *t.clientOpts
+	t.failPointNames = append(t.failPointNames, failPoint{name, &clientOpts})
 }
 
 // TrackFailPoint adds the given fail point to the list of fail points to be disabled when the current test finishes.
 // This function does not create a fail point on the server.
 func (t *T) TrackFailPoint(fpName string) {
-	t.failPointNames = append(t.failPointNames, fpName)
+	clientOpts := *t.clientOpts
+	t.failPointNames = append(t.failPointNames, failPoint{fpName, &clientOpts})
 }
 
 // ClearFailPoints disables all previously set failpoints for this test.
 func (t *T) ClearFailPoints() {
-	var err error
-	client := t.Client
-	if t.clientOpts.AutoEncryptionOptions != nil {
-		clientOpts := *t.clientOpts
-		clientOpts.AutoEncryptionOptions = nil
-		client, err = mongo.NewClient(&clientOpts)
+	for _, fp := range t.failPointNames {
+		client, err := mongo.NewClient(fp.clientOpts)
 		if err != nil {
 			t.Fatalf("error creating client: %v", err)
 		}
@@ -603,16 +605,13 @@ func (t *T) ClearFailPoints() {
 		defer func() {
 			_ = client.Disconnect(context.Background())
 		}()
-	}
-	db := client.Database("admin")
-	for _, fp := range t.failPointNames {
 		cmd := bson.D{
-			{"configureFailPoint", fp},
+			{"configureFailPoint", fp.name},
 			{"mode", "off"},
 		}
-		err = db.RunCommand(context.Background(), cmd).Err()
+		err = client.Database("admin").RunCommand(context.Background(), cmd).Err()
 		if err != nil {
-			t.Fatalf("error clearing fail point %s: %v", fp, err)
+			t.Fatalf("error clearing fail point %s: %v", fp.name, err)
 		}
 	}
 	t.failPointNames = t.failPointNames[:0]
@@ -739,15 +738,6 @@ func (t *T) createTestClient() {
 	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)
-	// }
-	// if err := t.fpClient.Connect(context.Background()); err != nil {
-	// 	t.Fatalf("error connecting client: %v", err)
-	// }
 }
 
 func (t *T) createTestCollection() {