mongo 2.8.0 → 2.9.0.rc0

data/spec/spec_tests/data/transactions/reads.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}
@@ -38,57 +43,12 @@ tests:
         data:
           *data
 
-  - description: count
+  - description: find
 
     operations:
       - &startTransaction
         name: startTransaction
         object: session0
-      - name: count
-        object: collection
-        arguments:
-          session: session0
-          filter:
-            _id: 1
-        result:
-          errorContains: "Cannot run 'count' in a multi-document transaction"
-          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: *outcome
-
-  - description: find
-
-    operations:
-      - *startTransaction
       - &find
         name: find
         object: collection

data/spec/spec_tests/data/transactions/retryable-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/retryable-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: []
 

data/spec/spec_tests/data/transactions/retryable-writes.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/run-command.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/transaction-options.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/update.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/write-concern.yml

@@ -1,7 +1,12 @@
 # Assumes the default for transactions is the same as for all ops, tests
 # setting the writeConcern to "majority".
-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_api/callback-aborts.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/data/transactions_api/callback-commits.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/data/transactions_api/callback-retry.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/data/transactions_api/commit-retry.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/data/transactions_api/commit-transienttransactionerror-4.2.yml

@@ -1,7 +1,10 @@
-database_name: &database_name "ruby-driver"
-collection_name: &collection_name "test"
+runOn:
+    -
+        minServerVersion: "4.1.6"
+        topology: ["replicaset"]
 
-minServerVersion: '4.1.6'
+database_name: &database_name "withTransaction-tests"
+collection_name: &collection_name "test"
 
 data: []
 

data/spec/spec_tests/data/transactions_api/commit-transienttransactionerror.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/data/transactions_api/commit-writeconcernerror.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/data/transactions_api/commit.yml

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

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

@@ -1,4 +1,9 @@
-database_name: &database_name "ruby-driver"
+runOn:
+    -
+        minServerVersion: "4.0"
+        topology: ["replicaset"]
+
+database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
 
 data: []

data/spec/spec_tests/retryable_reads_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe do
+  define_crud_spec_tests('Retryable reads spec tests', RETRYABLE_READS_TESTS.sort) do |spec, req, test|
+    let(:client) do
+      root_authorized_client.with({max_read_retries: 0}.update(test.client_options)).tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)
+      end
+    end
+  end
+end

data/spec/spec_tests/retryable_writes_spec.rb

@@ -1,74 +1,9 @@
 require 'spec_helper'
 
-describe 'Retryable writes spec tests' do
-
-  RETRYABLE_WRITES_TESTS.each do |file|
-
-    spec = Mongo::CRUD::Spec.new(file)
-
-    context(spec.description) do
-
-      spec.tests.each do |test|
-
-        context(test.description) do
-          min_server_fcv '3.6'
-          require_topology :replica_set
-
-          let(:collection) do
-            client[TEST_COLL]
-          end
-
-          let(:client) do
-            authorized_client_with_retry_writes
-          end
-
-          before do
-            unless spec.server_version_satisfied?(client)
-              skip 'Test cannot be run on this server version'
-            end
-          end
-
-          before do
-            test.setup_test(collection)
-          end
-
-          after do
-            test.clear_fail_point(collection)
-            collection.delete_many
-          end
-
-          let(:results) do
-            if test.error?
-              error = nil
-              begin
-                test.run(collection)
-              rescue => e
-                error = e
-              end
-              error
-            else
-              test.run(collection)
-            end
-          end
-
-          let(:verifier) { Mongo::CRUD::Verifier.new(test) }
-
-          it 'has the correct data in the collection', if: test.outcome_collection_data do
-            results
-            verifier.verify_collection_data(authorized_collection.find.to_a)
-          end
-
-          if test.error?
-            it 'raises an error' do
-              expect(results).to be_a(Mongo::Error)
-            end
-          else
-            it 'returns the correct result' do
-              verifier.verify_operation_result(results)
-            end
-          end
-        end
-      end
+describe do
+  define_crud_spec_tests('Retryable writes spec tests', RETRYABLE_WRITES_TESTS.sort) do |spec, req, test|
+    let(:client) do
+      authorized_client_with_retry_writes
     end
   end
 end

data/spec/spec_tests/transactions_api_spec.rb

@@ -7,55 +7,60 @@ describe 'Transactions API' do
     spec = Mongo::Transactions::Spec.new(file)
 
     context(spec.description) do
-      spec.tests.each do |test_factory|
-        test_instance = test_factory.call
+      define_spec_tests_with_requirements(spec) do |req|
+        spec.tests.each do |test_factory|
+          test_instance = test_factory.call
 
-        context(test_instance.description) do
-          require_transaction_support
+          context(test_instance.description) do
 
-          if spec.min_server_version
-            min_server_fcv spec.min_server_version.split('.')[0..1].join('.')
-          end
+            let(:test) { test_factory.call }
 
-          if test_instance.skip_reason
-            before do
-              skip test_instance.skip_reason
+            if test_instance.skip_reason
+              before do
+                skip test_instance.skip_reason
+              end
             end
-          end
 
-          let(:test) { test_factory.call }
-
-          before(:each) do
-            test.setup_test
-          end
-
-          after(:each) do
-            test.teardown_test
-          end
+            before(:each) do
+              if req.satisfied?
+                test.setup_test
+              end
+            end
 
-          let(:results) do
-            test.run
-          end
+            after(:each) do
+              if req.satisfied?
+                test.teardown_test
+              end
+            end
 
-          let(:verifier) { Mongo::Transactions::Verifier.new(test) }
+            let(:results) do
+              test.run
+            end
 
-          it 'returns the correct result' do
-            verifier.verify_operation_result(results[:results])
-          end
+            let(:verifier) { Mongo::CRUD::Verifier.new(test) }
 
-          it 'has the correct data in the collection', if: test_instance.outcome_collection_data do
-            results
-            verifier.verify_collection_data(results[:contents])
-          end
+            it 'returns the correct result' do
+              verifier.verify_operation_result(test_instance.expected_results, results[:results])
+            end
 
-          if test_instance.expectations
-            it 'has the correct number of command_started events' do
-              verifier.verify_command_started_event_count(results)
+            it 'has the correct data in the collection', if: test_instance.outcome.collection_data? do
+              results
+              verifier.verify_collection_data(
+                test_instance.outcome.collection_data,
+                results[:contents])
             end
 
-            test_instance.expectations.each_with_index do |expectation, i|
-              it "has the correct command_started event #{i}" do
-                verifier.verify_command_started_event(results, i)
+            if test_instance.expectations
+              it 'has the correct number of command_started events' do
+                verifier.verify_command_started_event_count(
+                  test_instance.expectations, results[:events])
+              end
+
+              test_instance.expectations.each_with_index do |expectation, i|
+                it "has the correct command_started event #{i}" do
+                  verifier.verify_command_started_event(
+                    test_instance.expectations, results[:events], i)
+                end
               end
             end
           end