GODRIVER-3473 Cleanup

Author: prestonvasquez

internal/mongoutil/mongoutil_test.go

@@ -13,6 +13,7 @@ import (
 	"time"
 
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
+	"go.mongodb.org/mongo-driver/v2/internal/ptrutil"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
@@ -37,12 +38,6 @@ func BenchmarkNewOptions(b *testing.B) {
 }
 
 func TestValidChangeStreamTimeouts(t *testing.T) {
-	t.Parallel()
-
-	newDurPtr := func(dur time.Duration) *time.Duration {
-		return &dur
-	}
-
 	tests := []struct {
 		name                     string
 		parent                   context.Context
@@ -61,7 +56,7 @@ func TestValidChangeStreamTimeouts(t *testing.T) {
 		{
 			name:            "no context deadline and maxAwaitTimeout",
 			parent:          context.Background(),
-			maxAwaitTimeout: newDurPtr(1),
+			maxAwaitTimeout: ptrutil.Ptr(time.Duration(1)),
 			timeout:         nil,
 			wantTimeout:     0,
 			want:            true,
@@ -70,50 +65,46 @@ func TestValidChangeStreamTimeouts(t *testing.T) {
 			name:            "no context deadline and timeout",
 			parent:          context.Background(),
 			maxAwaitTimeout: nil,
-			timeout:         newDurPtr(1),
+			timeout:         ptrutil.Ptr(time.Duration(1)),
 			wantTimeout:     0,
 			want:            true,
 		},
 		{
 			name:            "no context deadline and maxAwaitTime gt timeout",
 			parent:          context.Background(),
-			maxAwaitTimeout: newDurPtr(2),
-			timeout:         newDurPtr(1),
+			maxAwaitTimeout: ptrutil.Ptr(time.Duration(2)),
+			timeout:         ptrutil.Ptr(time.Duration(1)),
 			wantTimeout:     0,
 			want:            false,
 		},
 		{
 			name:            "no context deadline and maxAwaitTime lt timeout",
 			parent:          context.Background(),
-			maxAwaitTimeout: newDurPtr(1),
-			timeout:         newDurPtr(2),
+			maxAwaitTimeout: ptrutil.Ptr(time.Duration(1)),
+			timeout:         ptrutil.Ptr(time.Duration(2)),
 			wantTimeout:     0,
 			want:            true,
 		},
 		{
 			name:            "no context deadline and maxAwaitTime eq timeout",
 			parent:          context.Background(),
-			maxAwaitTimeout: newDurPtr(1),
-			timeout:         newDurPtr(1),
+			maxAwaitTimeout: ptrutil.Ptr(time.Duration(1)),
+			timeout:         ptrutil.Ptr(time.Duration(1)),
 			wantTimeout:     0,
 			want:            false,
 		},
 		{
 			name:            "no context deadline and maxAwaitTime with negative timeout",
 			parent:          context.Background(),
-			maxAwaitTimeout: newDurPtr(1),
-			timeout:         newDurPtr(-1),
+			maxAwaitTimeout: ptrutil.Ptr(time.Duration(1)),
+			timeout:         ptrutil.Ptr(time.Duration(-1)),
 			wantTimeout:     0,
 			want:            true,
 		},
 	}
 
 	for _, test := range tests {
-		test := test // Capture the range variable
-
 		t.Run(test.name, func(t *testing.T) {
-			t.Parallel()
-
 			got := ValidMaxAwaitTimeMS(test.parent, test.timeout, test.maxAwaitTimeout)
 			assert.Equal(t, test.want, got)
 		})

internal/spectest/skip.go

@@ -816,7 +816,7 @@ var skipTests = map[string][]string{
 		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit.json/withTransaction_commits_after_callback_returns",
 	},
 
-	"Address CSOT Compliance Issue in for Timeout Handling in Cursor Constructors (GODRIVER-3480)": {
+	"Address CSOT Compliance Issue in Timeout Handling for Cursor Constructors (GODRIVER-3480)": {
 		"TestUnifiedSpec/client-side-operations-timeout/tests/tailable-awaitData.json/apply_remaining_timeoutMS_if_less_than_maxAwaitTimeMS",
 	},
 }

mongo/change_stream.go

@@ -673,8 +673,7 @@ func (cs *ChangeStream) next(ctx context.Context, nonBlocking bool) bool {
 
 func (cs *ChangeStream) loopNext(ctx context.Context, nonBlocking bool) {
 	// Sending a maxAwaitTimeMS option to the server that is less than or equal to
-	// the operation timeout will result in a socket timeout error. This block
-	// short-circuits that behavior.
+	// the operation timeout will result in a socket timeout error.
 	if csOpts := cs.options; csOpts != nil && cs.client != nil &&
 		!mongoutil.ValidMaxAwaitTimeMS(ctx, cs.client.timeout, csOpts.MaxAwaitTime) {
 		cs.err = fmt.Errorf("MaxAwaitTime must be less than the operation timeout")

mongo/collection.go

@@ -955,8 +955,7 @@ func aggregate(a aggregateParams, opts ...options.Lister[options.AggregateOption
 	}
 
 	// Sending a maxAwaitTimeMS option to the server that is less than or equal to
-	// the operation timeout will result in a socket timeout error. This block
-	// short-circuits that behavior.
+	// the operation timeout will result in a socket timeout error.
 	if c := a.client; c != nil && !mongoutil.ValidMaxAwaitTimeMS(a.ctx, c.timeout, args.MaxAwaitTime) {
 		return nil, fmt.Errorf("MaxAwaitTime must be less than the operation timeout")
 	}
@@ -1359,8 +1358,7 @@ func (coll *Collection) find(
 	}
 
 	// Sending a maxAwaitTimeMS option to the server that is less than or equal to
-	// the operation timeout will result in a socket timeout error. This block
-	// short-circuits that behavior.
+	// the operation timeout will result in a socket timeout error.
 	if c := coll.client; c != nil && !mongoutil.ValidMaxAwaitTimeMS(ctx, c.timeout, args.MaxAwaitTime) {
 		return nil, fmt.Errorf("MaxAwaitTime must be less than the operation timeout")
 	}