mongo 2.11.0.rc0 → 2.11.0

data/spec/spec_tests/data/transactions/transaction-options-repl.yml

@@ -0,0 +1,117 @@
+runOn:
+  - minServerVersion: "4.0"
+    topology: ["replicaset"]
+
+database_name: &database_name "transaction-tests"
+collection_name: &collection_name "test"
+
+data: []
+
+tests:
+
+  - description: readConcern snapshot in startTransaction options
+
+    sessionOptions:
+      session0:
+        defaultTransactionOptions:
+          readConcern:
+            level: majority # Overridden.
+
+    operations:
+      - name: startTransaction
+        object: session0
+        arguments:
+          options:
+            readConcern:
+              level: snapshot
+      - name: insertOne
+        object: collection
+        arguments:
+          session: session0
+          document:
+            _id: 1
+        result:
+          insertedId: 1
+      - name: commitTransaction
+        object: session0
+      # Now test abort.
+      - name: startTransaction
+        object: session0
+        arguments:
+          options:
+            readConcern:
+              level: snapshot
+      - name: insertOne
+        object: collection
+        arguments:
+          session: session0
+          document:
+            _id: 2
+        result:
+          insertedId: 2
+      - name: abortTransaction
+        object: session0
+
+    expectations:
+      - command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - _id: 1
+            ordered: true
+            lsid: session0
+            txnNumber:
+              $numberLong: "1"
+            startTransaction: true
+            autocommit: false
+            readConcern:
+              level: snapshot
+            writeConcern:
+          command_name: insert
+          database_name: *database_name
+      - command_started_event:
+          command:
+            commitTransaction: 1
+            lsid: session0
+            txnNumber:
+              $numberLong: "1"
+            startTransaction:
+            autocommit: false
+            readConcern:
+            writeConcern:
+          command_name: commitTransaction
+          database_name: admin
+      - command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - _id: 2
+            ordered: true
+            lsid: session0
+            txnNumber:
+              $numberLong: "2"
+            startTransaction: true
+            autocommit: false
+            readConcern:
+              level: snapshot
+              afterClusterTime: 42
+            writeConcern:
+          command_name: insert
+          database_name: *database_name
+      - command_started_event:
+          command:
+            abortTransaction: 1
+            lsid: session0
+            txnNumber:
+              $numberLong: "2"
+            startTransaction:
+            autocommit: false
+            readConcern:
+            writeConcern:
+          command_name: abortTransaction
+          database_name: admin
+
+    outcome:
+      collection:
+        data:
+          - _id: 1

data/spec/spec_tests/data/transactions/transaction-options.yml

@@ -2,12 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
-    # Skip these tests on 4.3 due to
-    # https://jira.mongodb.org/browse/SERVER-40685 and
-    # https://jira.mongodb.org/browse/HELP-10518
-    #-
-    #    minServerVersion: "4.1.8"
-    #    topology: ["sharded"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"
@@ -183,7 +180,7 @@ tests:
       session0:
         defaultTransactionOptions:
           readConcern:
-            level: snapshot
+            level: majority
           writeConcern:
             w: 1
 
@@ -202,7 +199,7 @@ tests:
             startTransaction: true
             autocommit: false
             readConcern:
-              level: snapshot
+              level: majority
             writeConcern:
           command_name: insert
           database_name: *database_name
@@ -231,7 +228,7 @@ tests:
             startTransaction: true
             autocommit: false
             readConcern:
-              level: snapshot
+              level: majority
               afterClusterTime: 42
             writeConcern:
           command_name: insert
@@ -262,7 +259,7 @@ tests:
       session0:
         defaultTransactionOptions:
           readConcern:
-            level: majority
+            level: snapshot
           writeConcern:
             w: 1
 
@@ -272,7 +269,7 @@ tests:
         arguments:
           options:
             readConcern:
-              level: snapshot
+              level: majority
             writeConcern:
               w: majority
       - name: insertOne
@@ -290,7 +287,7 @@ tests:
         arguments:
           options:
             readConcern:
-              level: snapshot
+              level: majority
             writeConcern:
               w: majority
       - name: insertOne
@@ -317,7 +314,7 @@ tests:
             startTransaction: true
             autocommit: false
             readConcern:
-              level: snapshot
+              level: majority
             writeConcern:
           command_name: insert
           database_name: *database_name
@@ -346,7 +343,7 @@ tests:
             startTransaction: true
             autocommit: false
             readConcern:
-              level: snapshot
+              level: majority
               afterClusterTime: 42
             writeConcern:
           command_name: insert
@@ -377,7 +374,7 @@ tests:
       session0:
         defaultTransactionOptions:
           readConcern:
-            level: snapshot
+            level: majority
           writeConcern:
             w: majority
 
@@ -396,7 +393,7 @@ tests:
             startTransaction: true
             autocommit: false
             readConcern:
-              level: snapshot
+              level: majority
             writeConcern:
           command_name: insert
           database_name: *database_name
@@ -425,7 +422,7 @@ tests:
             startTransaction: true
             autocommit: false
             readConcern:
-              level: snapshot
+              level: majority
               afterClusterTime: 42
             writeConcern:
           command_name: insert
@@ -522,110 +519,6 @@ tests:
 
     outcome: *outcome
 
-  - description: readConcern snapshot in startTransaction options
-
-    sessionOptions:
-      session0:
-        defaultTransactionOptions:
-          readConcern:
-            level: majority # Overridden.
-
-    operations:
-      - name: startTransaction
-        object: session0
-        arguments:
-          options:
-            readConcern:
-              level: snapshot
-      - name: insertOne
-        object: collection
-        arguments:
-          session: session0
-          document:
-            _id: 1
-        result:
-          insertedId: 1
-      - name: commitTransaction
-        object: session0
-      # Now test abort.
-      - name: startTransaction
-        object: session0
-        arguments:
-          options:
-            readConcern:
-              level: snapshot
-      - name: insertOne
-        object: collection
-        arguments:
-          session: session0
-          document:
-            _id: 2
-        result:
-          insertedId: 2
-      - name: abortTransaction
-        object: session0
-
-    expectations:
-      - command_started_event:
-          command:
-            insert: *collection_name
-            documents:
-              - _id: 1
-            ordered: true
-            lsid: session0
-            txnNumber:
-              $numberLong: "1"
-            startTransaction: true
-            autocommit: false
-            readConcern:
-              level: snapshot
-            writeConcern:
-          command_name: insert
-          database_name: *database_name
-      - command_started_event:
-          command:
-            commitTransaction: 1
-            lsid: session0
-            txnNumber:
-              $numberLong: "1"
-            startTransaction:
-            autocommit: false
-            readConcern:
-            writeConcern:
-          command_name: commitTransaction
-          database_name: admin
-      - command_started_event:
-          command:
-            insert: *collection_name
-            documents:
-              - _id: 2
-            ordered: true
-            lsid: session0
-            txnNumber:
-              $numberLong: "2"
-            startTransaction: true
-            autocommit: false
-            readConcern:
-              level: snapshot
-              afterClusterTime: 42
-            writeConcern:
-          command_name: insert
-          database_name: *database_name
-      - command_started_event:
-          command:
-            abortTransaction: 1
-            lsid: session0
-            txnNumber:
-              $numberLong: "2"
-            startTransaction:
-            autocommit: false
-            readConcern:
-            writeConcern:
-          command_name: abortTransaction
-          database_name: admin
-
-    outcome: *outcome
-
   - description: client writeConcern ignored for bulk
 
     clientOptions:

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

@@ -4,6 +4,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "transaction-tests"
 collection_name: &collection_name "test"

data/spec/spec_tests/data/transactions_api/transaction-options.yml

@@ -2,10 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
-    # Disabled due to https://jira.mongodb.org/browse/SERVER-41532
-    #-
-    #    minServerVersion: "4.1.8"
-    #    topology: ["sharded"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -109,7 +108,7 @@ tests:
     sessionOptions:
       session0:
         defaultTransactionOptions:
-          readConcern: { level: snapshot }
+          readConcern: { level: majority }
           writeConcern: { w: 1 }
     operations: *operations
     expectations:
@@ -124,7 +123,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             startTransaction: true
             autocommit: false
-            readConcern: { level: snapshot }
+            readConcern: { level: majority }
             # omitted fields
             writeConcern: ~
           command_name: insert
@@ -162,7 +161,7 @@ tests:
                 result:
                   insertedId: 1
           options:
-            readConcern: { level: snapshot }
+            readConcern: { level: majority }
             writeConcern: { w: 1 }
     expectations:
       -
@@ -176,7 +175,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             startTransaction: true
             autocommit: false
-            readConcern: { level: snapshot }
+            readConcern: { level: majority }
             # omitted fields
             writeConcern: ~
           command_name: insert
@@ -201,7 +200,7 @@ tests:
     sessionOptions:
       session0:
         defaultTransactionOptions:
-          readConcern: { level: majority }
+          readConcern: { level: snapshot }
           writeConcern: { w: majority }
     operations: *operations_explicit_transactionOptions
     expectations:
@@ -216,7 +215,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             startTransaction: true
             autocommit: false
-            readConcern: { level: snapshot }
+            readConcern: { level: majority }
             # omitted fields
             writeConcern: ~
           command_name: insert
@@ -239,7 +238,7 @@ tests:
     description: withTransaction explicit transaction options override client options
     useMultipleMongoses: true
     clientOptions:
-      readConcernLevel: majority
+      readConcernLevel: local
       w: majority
     operations: *operations_explicit_transactionOptions
     expectations:
@@ -254,7 +253,7 @@ tests:
             txnNumber: { $numberLong: "1" }
             startTransaction: true
             autocommit: false
-            readConcern: { level: snapshot }
+            readConcern: { level: majority }
             # omitted fields
             writeConcern: ~
           command_name: insert

data/spec/spec_tests/dns_seedlist_discovery_spec.rb

@@ -5,15 +5,13 @@ describe 'DNS Seedlist Discovery' do
 
   include Mongo::ConnectionString
 
-  DNS_SEEDLIST_DISCOVERY_TESTS.each do |file_name|
+  DNS_SEEDLIST_DISCOVERY_TESTS.each do |test_path|
 
-    file = File.new(file_name)
-    spec = YAML.load(ERB.new(file.read).result)
-    file.close
+    spec = YAML.load(File.read(test_path))
 
     test = Mongo::ConnectionString::Test.new(spec)
 
-    context(File.basename(file_name)) do
+    context(File.basename(test_path)) do
 
       context 'when the uri is invalid', if: test.raise_error? do
 
@@ -43,8 +41,20 @@ describe 'DNS Seedlist Discovery' do
           expect(test.uri).to be_a(Mongo::URI::SRVProtocol)
         end
 
-        it 'creates a client with the correct hosts' do
-          expect(test.client).to have_hosts(test)
+        if test.seeds
+          # DNS seed list tests specify both seeds and hosts.
+          # To get the hosts, the client must do SDAM (as required in the
+          # spec tests' description), but this isn't testing DNS seed list -
+          # it is testing SDAM. Plus, all of the hosts are always the same.
+          # If seed list is given in the expectations, just test the seed
+          # list and not the expanded hosts.
+          it 'creates a client with the correct seeds' do
+            expect(test.client).to have_hosts(test, test.seeds)
+          end
+        else
+          it 'creates a client with the correct hosts' do
+            expect(test.client).to have_hosts(test, test.hosts)
+          end
         end
 
         it 'creates a client with the correct options' do