GODRIVER-3444 Use prose tests

Author: prestonvasquez

internal/integration/cursor_test.go

@@ -17,6 +17,7 @@ import (
 	"go.mongodb.org/mongo-driver/v2/internal/assert"
 	"go.mongodb.org/mongo-driver/v2/internal/failpoint"
 	"go.mongodb.org/mongo-driver/v2/internal/integration/mtest"
+	"go.mongodb.org/mongo-driver/v2/internal/require"
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
@@ -303,6 +304,75 @@ func TestCursor(t *testing.T) {
 		batchSize = sizeVal.Int32()
 		assert.Equal(mt, int32(4), batchSize, "expected batchSize 4, got %v", batchSize)
 	})
+
+	tailableAwaitDataCursorOpts := mtest.NewOptions().MinServerVersion("4.4").
+		Topologies(mtest.ReplicaSet, mtest.Sharded, mtest.LoadBalanced, mtest.Single)
+
+	mt.RunOpts("tailable awaitData cursor", tailableAwaitDataCursorOpts, func(mt *mtest.T) {
+		mt.Run("apply remaining timeoutMS if less than maxAwaitTimeMS", func(mt *mtest.T) {
+			initCollection(mt, mt.Coll)
+			mt.ClearEvents()
+
+			// Create a find cursor
+			opts := options.Find().SetBatchSize(1).SetMaxAwaitTime(100 * time.Millisecond)
+
+			cursor, err := mt.Coll.Find(context.Background(), bson.D{}, opts)
+			require.NoError(mt, err)
+
+			_ = mt.GetStartedEvent() // Empty find from started list.
+
+			defer cursor.Close(context.Background())
+
+			ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)
+			defer cancel()
+
+			// Iterate twice to force a getMore
+			cursor.Next(ctx)
+			cursor.Next(ctx)
+
+			cmd := mt.GetStartedEvent().Command
+
+			maxTimeMSRaw, err := cmd.LookupErr("maxTimeMS")
+			require.NoError(mt, err)
+
+			got, ok := maxTimeMSRaw.AsInt64OK()
+			require.True(mt, ok)
+
+			assert.LessOrEqual(mt, got, int64(50))
+		})
+
+		mt.RunOpts("apply maxAwaitTimeMS if less than remaining timeout", tailableAwaitDataCursorOpts, func(mt *mtest.T) {
+			initCollection(mt, mt.Coll)
+			mt.ClearEvents()
+
+			// Create a find cursor
+			opts := options.Find().SetBatchSize(1).SetMaxAwaitTime(50 * time.Millisecond)
+
+			cursor, err := mt.Coll.Find(context.Background(), bson.D{}, opts)
+			require.NoError(mt, err)
+
+			_ = mt.GetStartedEvent() // Empty find from started list.
+
+			defer cursor.Close(context.Background())
+
+			ctx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond)
+			defer cancel()
+
+			// Iterate twice to force a getMore
+			cursor.Next(ctx)
+			cursor.Next(ctx)
+
+			cmd := mt.GetStartedEvent().Command
+
+			maxTimeMSRaw, err := cmd.LookupErr("maxTimeMS")
+			require.NoError(mt, err)
+
+			got, ok := maxTimeMSRaw.AsInt64OK()
+			require.True(mt, ok)
+
+			assert.LessOrEqual(mt, got, int64(50))
+		})
+	})
 }
 
 type tryNextCursor interface {

internal/integration/unified/unified_spec_runner.go

@@ -92,8 +92,10 @@ var (
 		//     timeoutMS.
 		//
 		// Once GODRIVER-3473 is completed, we can continue running these tests.
-		"error if maxAwaitTimeMS is equal to timeoutMS":     "Go Driver does not implement this behavior. See GODRIVER-3473",
-		"error if maxAwaitTimeMS is greater than timeoutMS": "Go Driver does not implement this behavior. See GODRIVER-3473",
+		"error if maxAwaitTimeMS is equal to timeoutMS":         "Go Driver does not implement this behavior. See GODRIVER-3473",
+		"error if maxAwaitTimeMS is greater than timeoutMS":     "Go Driver does not implement this behavior. See GODRIVER-3473",
+		"apply remaining timeoutMS if less than maxAwaitTimeMS": "Go Driver does not implement this behavior. See GODRIVER-3473",
+		"apply maxAwaitTimeMS if less than remaining timeout":   "Go Driver does not implement this behavior. See GODRIVER-3473",
 
 		// DRIVERS-2953: This test requires that the driver sends a "getMore"
 		// with "maxTimeMS" set. However, "getMore" can only include "maxTimeMS"

testdata/client-side-operations-timeout/tailable-awaitData.json

@@ -420,7 +420,7 @@
       ]
     },
     {
-      "description": "apply remaining timeoutMS if less than maxAwaitTimeMS ",
+      "description": "apply remaining timeoutMS if less than maxAwaitTimeMS",
       "operations": [
         {
           "name": "createFindCursor",
@@ -429,23 +429,20 @@
             "filter": {},
             "cursorType": "tailableAwait",
             "batchSize": 1,
-            "maxAwaitTimeMS": 100
+            "maxAwaitTimeMS": 100,
+            "timeoutMS": 50
           },
           "saveResultAsEntity": "tailableCursor"
         },
         {
           "name": "iterateOnce",
           "object": "tailableCursor",
-          "arguments": {
-            "timeoutMS": 50
-          }
+          "arguments": null
         },
         {
           "name": "iterateOnce",
           "object": "tailableCursor",
-          "arguments": {
-            "timeoutMS": 50
-          }
+          "arguments": null
         }
       ],
       "expectEvents": [
@@ -483,23 +480,20 @@
             "filter": {},
             "cursorType": "tailableAwait",
             "batchSize": 1,
-            "maxAwaitTimeMS": 50
+            "maxAwaitTimeMS": 50,
+            "timeoutMS": 100
           },
           "saveResultAsEntity": "tailableCursor"
         },
         {
           "name": "iterateOnce",
           "object": "tailableCursor",
-          "arguments": {
-            "timeoutMS": 100
-          }
+          "arguments": null
         },
         {
           "name": "iterateOnce",
           "object": "tailableCursor",
-          "arguments": {
-            "timeoutMS": 100
-          }
+          "arguments": null
         }
       ],
       "expectEvents": [

testdata/client-side-operations-timeout/tailable-awaitData.yml

@@ -247,7 +247,7 @@ tests:
                 getMore: { $$type: ["int", "long"] }
                 collection: *collectionName
 
-  - description: "apply remaining timeoutMS if less than maxAwaitTimeMS "
+  - description: "apply remaining timeoutMS if less than maxAwaitTimeMS"
     operations:
       - name: createFindCursor
         object: *collection
@@ -256,16 +256,15 @@ tests:
           cursorType: tailableAwait
           batchSize: 1
           maxAwaitTimeMS: 100
+          timeoutMS: 50
         saveResultAsEntity: &tailableCursor tailableCursor
       # Iterate twice to force a getMore.
       - name: iterateOnce
         object: *tailableCursor
         arguments: 
-          timeoutMS: 50
       - name: iterateOnce
         object: *tailableCursor
         arguments: 
-          timeoutMS: 50
     expectEvents:
       - client: *client
         events:
@@ -287,16 +286,15 @@ tests:
           cursorType: tailableAwait
           batchSize: 1
           maxAwaitTimeMS: 50
+          timeoutMS: 100
         saveResultAsEntity: &tailableCursor tailableCursor
       # Iterate twice to force a getMore.
       - name: iterateOnce
         object: *tailableCursor
         arguments: 
-          timeoutMS: 100
       - name: iterateOnce
         object: *tailableCursor
         arguments: 
-          timeoutMS: 100
     expectEvents:
       - client: *client
         events: