Decouple teardown from tadc factories

Author: prestonvasquez

internal/integration/cursor_test.go

@@ -319,18 +319,18 @@ func parseMaxAwaitTime(mt *mtest.T, evt *event.CommandStartedEvent) int64 {
 	return got
 }
 
-func tadcFindFactory(ctx context.Context, mt *mtest.T) (*mongo.Cursor, func() error) {
+func tadcFindFactory(ctx context.Context, mt *mtest.T) *mongo.Cursor {
 	mt.Helper()
 
 	initCollection(mt, mt.Coll)
 	cur, err := mt.Coll.Find(ctx, bson.D{{"x", 1}},
 		options.Find().SetBatchSize(1).SetCursorType(options.TailableAwait))
 	require.NoError(mt, err, "Find error: %v", err)
 
-	return cur, func() error { return cur.Close(context.Background()) }
+	return cur
 }
 
-func tadcAggregateFactory(ctx context.Context, mt *mtest.T) (*mongo.Cursor, func() error) {
+func tadcAggregateFactory(ctx context.Context, mt *mtest.T) *mongo.Cursor {
 	mt.Helper()
 
 	initCollection(mt, mt.Coll)
@@ -341,10 +341,10 @@ func tadcAggregateFactory(ctx context.Context, mt *mtest.T) (*mongo.Cursor, func
 	cursor, err := mt.Coll.Aggregate(ctx, pipe, opts)
 	require.NoError(mt, err, "Aggregate error: %v", err)
 
-	return cursor, func() error { return cursor.Close(context.Background()) }
+	return cursor
 }
 
-func tadcRunCommandCursorFactory(ctx context.Context, mt *mtest.T) (*mongo.Cursor, func() error) {
+func tadcRunCommandCursorFactory(ctx context.Context, mt *mtest.T) *mongo.Cursor {
 	mt.Helper()
 
 	initCollection(mt, mt.Coll)
@@ -358,7 +358,7 @@ func tadcRunCommandCursorFactory(ctx context.Context, mt *mtest.T) (*mongo.Curso
 	})
 	require.NoError(mt, err, "RunCommandCursor error: %v", err)
 
-	return cur, func() error { return cur.Close(context.Background()) }
+	return cur
 }
 
 // For tailable awaitData cursors, the maxTimeMS for a getMore should be
@@ -369,17 +369,17 @@ func TestCursor_tailableAwaitData_applyRemainingTimeout(t *testing.T) {
 	const timeout = 2000 * time.Millisecond
 
 	// Setup mtest instance.
-	mt := mtest.New(t, mtest.NewOptions().CreateClient(false))
+	mt := mtest.New(t, mtest.NewOptions().CreateClient(false).MinServerVersion("4.2"))
 
 	cappedOpts := options.CreateCollection().SetCapped(true).
 		SetSizeInBytes(1024 * 64)
 
-	// TODO(SERVER-96344): mongos doesn't honor a failpoint's full blockTimeMS.
+	// TODO(GODRIVER-3328): mongos doesn't honor a failpoint's full blockTimeMS.
 	baseTopologies := []mtest.TopologyKind{mtest.Single, mtest.LoadBalanced, mtest.ReplicaSet}
 
 	type testCase struct {
 		name       string
-		factory    func(ctx context.Context, mt *mtest.T) (*mongo.Cursor, func() error)
+		factory    func(ctx context.Context, mt *mtest.T) *mongo.Cursor
 		opTimeout  bool
 		topologies []mtest.TopologyKind
 
@@ -463,8 +463,8 @@ func TestCursor_tailableAwaitData_applyRemainingTimeout(t *testing.T) {
 				defer cancel()
 			}
 
-			cur, cleanup := tc.factory(ctx, mt)
-			defer func() { assert.NoError(mt, cleanup()) }()
+			cur := tc.factory(ctx, mt)
+			defer func() { assert.NoError(mt, cur.Close(context.Background())) }()
 
 			require.NoError(mt, cur.Err())