mongo 2.8.0 → 2.9.0.rc0

data/spec/spec_tests/data/retryable_writes/updateOne-serverErrors.yml

@@ -1,15 +1,18 @@
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.7"
+        topology: ["sharded"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-# TODO: this should change to 4.0 once 4.0.0 is released.
-minServerVersion: '3.99'
-
 tests:
     -
         description: "UpdateOne succeeds after PrimarySteppedDown"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }
@@ -32,8 +35,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "UpdateOne succeeds after WriteConcernError ShutdownInProgress"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: failCommand
             mode: { times: 1 }

data/spec/spec_tests/data/retryable_writes/updateOne.yml

@@ -1,14 +1,15 @@
+runOn:
+    -
+        minServerVersion: "3.6"
+        topology: ["replicaset"]
+
 data:
     - { _id: 1, x: 11 }
     - { _id: 2, x: 22 }
 
-minServerVersion: '3.6'
-
 tests:
     -
         description: "UpdateOne is committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -28,8 +29,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "UpdateOne is not committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -50,8 +49,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "UpdateOne is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }
@@ -69,8 +66,6 @@ tests:
                     - { _id: 2, x: 22 }
     -
         description: "UpdateOne with upsert is committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -93,8 +88,6 @@ tests:
                     - { _id: 3, x: 34 }
     -
         description: "UpdateOne with upsert is not committed on first attempt"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 1 }
@@ -118,8 +111,6 @@ tests:
                     - { _id: 3, x: 34 }
     -
         description: "UpdateOne with upsert is never committed"
-        clientOptions:
-            retryWrites: true
         failPoint:
             configureFailPoint: onPrimaryTransactionalWrite
             mode: { times: 2 }

data/spec/spec_tests/data/transactions/abort.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 

data/spec/spec_tests/data/transactions/bulk.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 

data/spec/spec_tests/data/transactions/causal-consistency.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data:
   - _id: 1
@@ -7,7 +12,8 @@ data:
 
 tests:
   - description: causal consistency
-
+    clientOptions:
+      retryWrites: false
     operations:
       # Update a document without a transaction.
       - &updateOne
@@ -88,7 +94,8 @@ tests:
             count: 2
 
   - description: causal consistency disabled
-
+    clientOptions:
+      retryWrites: false
     sessionOptions:
       session0:
         causalConsistency: false

data/spec/spec_tests/data/transactions/commit.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 tests:
@@ -438,7 +443,8 @@ tests:
         data: []
 
   - description: reset session state commit
-
+    clientOptions:
+      retryWrites: false
     operations:
       - name: startTransaction
         object: session0
@@ -516,7 +522,8 @@ tests:
           - _id: 2
 
   - description: reset session state abort
-
+    clientOptions:
+      retryWrites: false
     operations:
       - name: startTransaction
         object: session0

data/spec/spec_tests/data/transactions/count.yml

@@ -0,0 +1,64 @@
+runOn:
+    # SERVER-35388 introduced OperationNotSupportedInTransaction in 4.0.2
+    -
+        minServerVersion: "4.0.2"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
+
+data: &data
+  - {_id: 1}
+  - {_id: 2}
+  - {_id: 3}
+  - {_id: 4}
+
+tests:
+  - description: count
+
+    operations:
+      - name: startTransaction
+        object: session0
+      - name: count
+        object: collection
+        arguments:
+          session: session0
+          filter:
+            _id: 1
+        result:
+          errorCodeName: OperationNotSupportedInTransaction
+          errorLabelsOmit: ["TransientTransactionError", "UnknownTransactionCommitResult"]
+      - name: abortTransaction
+        object: session0
+
+    expectations:
+      - command_started_event:
+          command:
+            count: *collection_name
+            query:
+              _id: 1
+            readConcern:
+            lsid: session0
+            txnNumber:
+              $numberLong: "1"
+            startTransaction: true
+            autocommit: false
+            writeConcern:
+          command_name: count
+          database_name: *database_name
+      - command_started_event:
+          command:
+            abortTransaction: 1
+            lsid: session0
+            txnNumber:
+              $numberLong: "1"
+            startTransaction:
+            autocommit: false
+            writeConcern:
+          command_name: abortTransaction
+          database_name: admin
+
+    outcome:
+      collection:
+        data:
+          *data

data/spec/spec_tests/data/transactions/delete.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data:
   - _id: 1

data/spec/spec_tests/data/transactions/error-labels.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 
@@ -363,6 +368,7 @@ tests:
             pipeline:
               - $project:
                   _id: 1
+            cursor: {}
             readConcern:
             lsid: session0
             txnNumber:

data/spec/spec_tests/data/transactions/errors.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 tests:

data/spec/spec_tests/data/transactions/findOneAndDelete.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data:
   - _id: 1

data/spec/spec_tests/data/transactions/findOneAndReplace.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data:
   - _id: 1

data/spec/spec_tests/data/transactions/findOneAndUpdate.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data:
   - _id: 1

data/spec/spec_tests/data/transactions/insert.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 
@@ -259,6 +264,8 @@ tests:
 
   # This test proves that the driver parses the collectionOptions writeConcern.
   - description: collection writeConcern without transaction
+    clientOptions:
+      retryWrites: false
     operations:
       - name: insertOne
         object: collection

data/spec/spec_tests/data/transactions/isolation.yml

@@ -1,7 +1,12 @@
 # Test snapshot isolation.
 # This test doesn't check contents of command-started events.
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 

data/spec/spec_tests/data/transactions/read-concern.yml

@@ -1,5 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: &data
   - {_id: 1}
@@ -39,7 +44,8 @@ tests:
             aggregate: *collection_name
             pipeline:
               - $match: {_id: {$gte: 2}}
-              - $group: {_id: null, n: {$sum: 1}}
+              - $group: {_id: 1, n: {$sum: 1}}
+            cursor: {}
             lsid: session0
             readConcern:
               level: snapshot
@@ -54,7 +60,8 @@ tests:
             aggregate: *collection_name
             pipeline:
               - $match: {_id: {$gte: 2}}
-              - $group: {_id: null, n: {$sum: 1}}
+              - $group: {_id: 1, n: {$sum: 1}}
+            cursor: {}
             lsid: session0
             readConcern:  # No readConcern
             txnNumber:
@@ -358,7 +365,8 @@ tests:
             aggregate: *collection_name
             pipeline:
               - $match: {_id: {$gte: 2}}
-              - $group: {_id: null, n: {$sum: 1}}
+              - $group: {_id: 1, n: {$sum: 1}}
+            cursor: {}
             lsid: session0
             readConcern:  # No readConcern
             txnNumber:
@@ -372,7 +380,8 @@ tests:
             aggregate: *collection_name
             pipeline:
               - $match: {_id: {$gte: 2}}
-              - $group: {_id: null, n: {$sum: 1}}
+              - $group: {_id: 1, n: {$sum: 1}}
+            cursor: {}
             lsid: session0
             readConcern:  # No readConcern
             txnNumber:

data/spec/spec_tests/data/transactions/read-pref.yml

@@ -1,6 +1,11 @@
 # This test doesn't check contents of command-started events.
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "transactions-tests"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
 
 data: []