mongo 2.11.0.rc0 → 2.11.0

data/spec/runners/connection_string.rb

@@ -0,0 +1,116 @@
+
+def define_connection_string_spec_tests(test_paths, spec_cls = Mongo::ConnectionString::Spec, &block)
+
+  clean_slate_for_all
+
+  test_paths.each do |path|
+
+    spec = spec_cls.new(path)
+
+    context(spec.description) do
+
+      #include Mongo::ConnectionString
+
+      spec.tests.each_with_index do |test, index|
+        context "when a #{test.description} is provided" do
+          if test.description.downcase.include?("gssapi")
+            require_mongo_kerberos
+          end
+
+          context 'when the uri is invalid', unless: test.valid? do
+
+            it 'raises an error' do
+              expect{
+                test.uri
+              }.to raise_exception(Mongo::Error::InvalidURI)
+            end
+          end
+
+          context 'when the uri should warn', if: test.warn? do
+
+            before do
+              expect(Mongo::Logger.logger).to receive(:warn)
+            end
+
+            it 'warns' do
+              expect(test.client).to be_a(Mongo::Client)
+            end
+          end
+
+          context 'when the uri is valid', if: test.valid? do
+
+            it 'does not raise an exception' do
+              expect(test.uri).to be_a(Mongo::URI)
+            end
+
+            it 'creates a client with the correct hosts' do
+              expect(test.client).to have_hosts(test, test.hosts)
+            end
+
+            it 'creates a client with the correct authentication properties' do
+              expect(test.client).to match_auth(test)
+            end
+
+            it 'creates a client with the correct options' do
+              expect(test.client).to match_options(test)
+            end
+
+            if test.read_concern_expectation
+              # Tests do not specify a read concern in the input and expect
+              # the read concern to be {); our non-specified read concern is nil.
+              # (But if a test used nil for the expectation, we wouldn't assert
+              # read concern at all.)
+              if test.read_concern_expectation == {}
+                it 'creates a client with no read concern' do
+                  actual = Utils.camelize_hash(test.client.options[:read_concern])
+                  expect(actual).to be nil
+                end
+              else
+
+                it 'creates a client with the correct read concern' do
+                  actual = Utils.camelize_hash(test.client.options[:read_concern])
+                  expect(actual).to eq(test.read_concern_expectation)
+                end
+              end
+            end
+
+            if test.write_concern_expectation
+              let(:actual_write_concern) do
+                Utils.camelize_hash(test.client.options[:write_concern])
+              end
+
+              let(:expected_write_concern) do
+                test.write_concern_expectation.dup.tap do |expected|
+                  # Spec tests have expectations on the "driver API" which is
+                  # different from what is being sent to the server. In Ruby
+                  # the "driver API" matches what we send to the server, thus
+                  # these expectations are rather awkward to work with.
+                  # Convert them all to expected server fields.
+                  j = expected.delete('journal')
+                  unless j.nil?
+                    expected['j'] = j
+                  end
+                  wtimeout = expected.delete('wtimeoutMS')
+                  unless wtimeout.nil?
+                    expected['wtimeout'] = wtimeout
+                  end
+                end
+              end
+
+              if test.write_concern_expectation == {}
+
+                it 'creates a client with no write concern' do
+                  expect(actual_write_concern).to be nil
+                end
+              else
+                it 'creates a client with the correct write concern' do
+                  expect(actual_write_concern).to eq(expected_write_concern)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/runners/read_write_concern_document.rb

@@ -0,0 +1,67 @@
+module ReadWriteConcernDocument
+
+  class Spec
+
+    attr_reader :description
+
+    # Instantiate the new spec.
+    #
+    # @param [ String ] test_path The path to the file.
+    #
+    # @since 2.0.0
+    def initialize(test_path)
+      @spec = YAML.load(File.read(test_path))
+      @description = File.basename(test_path)
+    end
+
+    def tests
+      @tests ||= @spec['tests'].collect do |spec|
+        Test.new(spec)
+      end
+    end
+  end
+
+  class Test
+    def initialize(spec)
+      @spec = spec
+      @description = @spec['description']
+      @uri_string = @spec['uri']
+    end
+
+    attr_reader :description
+
+    def valid?
+      !!@spec['valid']
+    end
+
+    def input_document
+      (@spec['readConcern'] || @spec['writeConcern']).tap do |concern|
+        # Documented Ruby API matches the server API, and Ruby prohibits
+        # journal key as used in the spec tests...
+        if concern.key?('journal')
+          concern['j'] = concern.delete('journal')
+        end
+        # ... and uses wtimeout instead of wtimeoutMS
+        if concern.key?('wtimeoutMS')
+          concern['wtimeout'] = concern.delete('wtimeoutMS')
+        end
+      end
+    end
+
+    def server_document
+      @spec['readConcernDocument'] || @spec['writeConcernDocument']
+    end
+
+    # Returns true, false or nil
+    def server_default?
+      # Do not convert to boolean
+      @spec['isServerDefault']
+    end
+
+    # Returns true, false or nil
+    def acknowledged?
+      # Do not convert to boolean
+      @spec['isAcknowledged']
+    end
+  end
+end

data/spec/spec_tests/change_streams_spec.rb

@@ -26,12 +26,27 @@ describe 'ChangeStreams' do
             test.run
           end
 
+          let(:verifier) { Mongo::CRUD::Verifier.new(test) }
+
           it 'returns the correct result' do
             expect(result[:result]).to match_result(test)
           end
 
-          it 'has the correct command_started events', if: test.expectations do
-            expect(result[:events]).to match_commands(test)
+          if test.expectations
+            let(:actual_events) do
+              result[:events]
+            end
+
+            it 'has the correct number of command_started events' do
+              verifier.verify_command_started_event_count(test.expectations, actual_events)
+            end
+
+            test.expectations.each_with_index do |expectation, i|
+              it "has the correct command_started event #{i+1}" do
+                verifier.verify_command_started_event(
+                  test.expectations, actual_events, i)
+              end
+            end
           end
         end
       end

data/spec/spec_tests/connection_string_spec.rb

@@ -1,62 +1,5 @@
 require 'spec_helper'
 
-describe 'ConnectionString' do
-  include Mongo::ConnectionString
-
-  clean_slate_for_all
-
-  CONNECTION_STRING_TESTS.each do |file|
-
-    spec = Mongo::ConnectionString::Spec.new(file)
-
-    context(spec.description) do
-
-      spec.tests.each_with_index do |test, index|
-        context "when a #{test.description} is provided" do
-          if test.description.downcase.include?("gssapi")
-            require_mongo_kerberos
-          end
-
-          context 'when the uri is invalid', unless: test.valid? do
-
-            it 'raises an error' do
-              expect{
-                test.uri
-              }.to raise_exception(Mongo::Error::InvalidURI)
-            end
-          end
-
-          context 'when the uri should warn', if: test.warn? do
-
-            before do
-              expect(Mongo::Logger.logger).to receive(:warn)
-            end
-
-            it 'warns' do
-              expect(test.client).to be_a(Mongo::Client)
-            end
-          end
-
-          context 'when the uri is valid', if: test.valid? do
-
-            it 'does not raise an exception' do
-              expect(test.uri).to be_a(Mongo::URI)
-            end
-
-            it 'creates a client with the correct hosts' do
-              expect(test.client).to have_hosts(test)
-            end
-
-            it 'creates a client with the correct authentication properties' do
-              expect(test.client).to match_auth(test)
-            end
-
-            it 'creates a client with the correct options' do
-              expect(test.client).to match_options(test)
-            end
-          end
-        end
-      end
-    end
-  end
+describe 'Connection String' do
+  define_connection_string_spec_tests(CONNECTION_STRING_TESTS)
 end

data/spec/spec_tests/data/change_streams/change-streams-errors.yml

@@ -12,7 +12,8 @@ tests:
     changeStreamPipeline: []
     changeStreamOptions: {}
     operations: []
-    expectations: []
+    # https://jira.mongodb.org/browse/SPEC-1462
+    expectations: ~
     result:
       error:
         code: 40573
@@ -42,8 +43,7 @@ tests:
             cursor: {}
             pipeline:
               - 
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
               -
                 $unsupported: foo
           command_name: aggregate

data/spec/spec_tests/data/change_streams/change-streams.yml

@@ -27,8 +27,7 @@ tests:
             cursor: {}
             pipeline:
               -
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
           command_name: aggregate
           database_name: *database_name
     result:
@@ -59,7 +58,8 @@ tests:
         arguments:
           document:
             x: 1
-    expectations: []
+    # https://jira.mongodb.org/browse/SPEC-1462
+    expectations: ~
     result:
       success:
         -
@@ -110,8 +110,7 @@ tests:
             cursor: {}
             pipeline:
               - 
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
           command_name: aggregate
           database_name: *database_name
     result:
@@ -158,12 +157,11 @@ tests:
             cursor: {}
             pipeline:
               - 
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
               -
                 $match:
                   "fullDocument.z":
-                    $numberInt: "3"
+                    3
           command_name: aggregate
           database_name: *database_name
     result:
@@ -175,7 +173,7 @@ tests:
             coll: *collection_name
           fullDocument:
             z:
-              $numberInt: "3"
+              3
   -
     description: Executing a watch helper on a Database results in notifications for changes to all collections in the specified database.
     minServerVersion: "3.8.0"
@@ -211,12 +209,11 @@ tests:
         command_started_event:
           command:
             aggregate:
-              $numberInt: "1"
+              1
             cursor: {}
             pipeline:
               - 
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
           command_name: aggregate
           database_name: *database_name
     result:
@@ -272,12 +269,11 @@ tests:
         command_started_event:
           command:
             aggregate:
-              $numberInt: "1"
+              1
             cursor: {}
             pipeline:
               - 
                 $changeStream:
-                  fullDocument: default
                   allChangesForCluster: true
           command_name: aggregate
           database_name: admin
@@ -357,8 +353,7 @@ tests:
             cursor: {}
             pipeline:
               -
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
           command_name: aggregate
           database_name: *database_name
     result:
@@ -416,8 +411,7 @@ tests:
             cursor: {}
             pipeline:
               -
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
           command_name: aggregate
           database_name: *database_name
     result:
@@ -453,8 +447,7 @@ tests:
             cursor: {}
             pipeline:
               -
-                $changeStream:
-                  fullDocument: default
+                $changeStream: {}
           command_name: aggregate
           database_name: *database_name
     result:
@@ -466,3 +459,78 @@ tests:
             coll: *collection_name
         -
           operationType: invalidate
+  # Test that resume logic works correctly even after consecutive retryable failures of a getMore command,
+  # with no intervening events.  This is ensured by setting the batch size of the change stream to 1,
+  -
+    description: Test consecutive resume
+    minServerVersion: "4.1.7"
+    target: collection
+    topology:
+      - replicaset
+    changeStreamPipeline: []
+    changeStreamOptions: { batchSize: 1}
+    failPoint:
+      configureFailPoint: failCommand
+      mode: {times: 2}
+      data:
+          failCommands: ["getMore"]
+          closeConnection: true
+    operations:
+      -
+        database: *database_name
+        collection: *collection_name
+        name: insertOne
+        arguments:
+          document:
+            x: 1
+      -
+        database: *database_name
+        collection: *collection_name
+        name: insertOne
+        arguments:
+          document:
+            x: 2
+      -
+        database: *database_name
+        collection: *collection_name
+        name: insertOne
+        arguments:
+          document:
+            x: 3
+    expectations:
+      -
+        command_started_event:
+          command:
+            aggregate: *collection_name
+            cursor: {batchSize: 1}
+            pipeline:
+              -
+                $changeStream: {}
+          command_name: aggregate
+          database_name: *database_name
+    result:
+      success:
+        -
+          operationType: insert
+          ns:
+            db: *database_name
+            coll: *collection_name
+          fullDocument:
+            x:
+              $numberInt: "1"
+        -
+          operationType: insert
+          ns:
+            db: *database_name
+            coll: *collection_name
+          fullDocument:
+            x:
+              $numberInt: "2"
+        -
+          operationType: insert
+          ns:
+            db: *database_name
+            coll: *collection_name
+          fullDocument:
+            x:
+              $numberInt: "3"