mongo 2.5.3 → 2.6.0

data/spec/spec_tests/change_streams_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+describe 'ChangeStreams' do
+
+  CHANGE_STREAMS_TESTS.each do |file|
+
+    spec = Mongo::ChangeStreams::Spec.new(file)
+
+    context(spec.description) do
+
+      spec.tests.each do |test|
+
+        context(test.description) do
+
+          before(:each) do
+            unless test.configuration_satisfied?(authorized_client)
+              skip 'Version or topology requirements not satisfied'
+            end
+
+            test.setup_test
+          end
+
+          after(:each) do
+            test.teardown_test if test.configuration_satisfied?(authorized_client)
+          end
+
+          let(:result) do
+            test.run
+          end
+
+          it 'returns the correct result' do
+            expect(result[:result]).to match_result(test)
+          end
+
+          it 'has the correct command_started events' do
+            expect(result[:events]).to match_commands(test)
+          end
+        end
+      end
+    end
+  end
+end

data/spec/{mongo → spec_tests}/command_monitoring_spec.rb

@@ -26,7 +26,7 @@ describe 'Command Monitoring Events' do
         end
 
         let(:monitoring) do
-          authorized_client.instance_variable_get(:@monitoring)
+          authorized_client.send(:monitoring)
         end
 
         before do
@@ -41,7 +41,13 @@ describe 'Command Monitoring Events' do
 
         test.expectations.each do |expectation|
 
-          it "generates a #{expectation.event_name} for #{expectation.command_name}", unless: ignore?(test) do
+          before do
+            if ignore?(test)
+              skip 'Preconditions not met'
+            end
+          end
+
+          it "generates a #{expectation.event_name} for #{expectation.command_name}" do
             begin
               test.run(authorized_collection)
               event = subscriber.send(expectation.event_type)[expectation.command_name]

data/spec/{mongo → spec_tests}/connection_string_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe 'ConnectionString' do
   include Mongo::ConnectionString

data/spec/{mongo → spec_tests}/crud_spec.rb

@@ -10,15 +10,13 @@ describe 'CRUD' do
 
       spec.tests.each do |test|
 
-        around do |example|
-          if spec.server_version_satisfied?(authorized_client)
-            example.run
-          end
-        end
-
         context(test.description) do
 
           before(:each) do
+            unless spec.server_version_satisfied?(authorized_client)
+              skip 'Version requirement not satisfied'
+            end
+
             test.setup_test(authorized_collection)
           end
 
@@ -26,7 +24,7 @@ describe 'CRUD' do
             authorized_collection.delete_many
           end
 
-          let(:results) do
+          let!(:results) do
             test.run(authorized_collection)
           end
 

data/spec/{mongo → spec_tests}/dns_seedlist_discovery_spec.rb

@@ -54,7 +54,7 @@ describe 'DNS Seedlist Discovery' do
 
       test = Mongo::ConnectionString::Test.new(spec)
 
-      context(File.basename(file_name), if: test_connecting_externally?) do
+      context(File.basename(file_name)) do
 
         context 'when the uri is invalid', if: test.raise_error? do
 

data/spec/spec_tests/retryable_writes_spec.rb

@@ -0,0 +1,78 @@
+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
+
+          let(:collection) do
+            client[TEST_COLL]
+          end
+
+          let(:client) do
+            authorized_client_with_retry_writes
+          end
+
+          before do
+            unless sessions_enabled?
+              skip 'Sessions not enabled'
+            end
+            unless replica_set?
+              skip 'Not in replica set'
+            end
+            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
+
+          if test.outcome_collection_data
+            it 'has the correct data in the collection' do
+              results
+              expect(collection.find.to_a).to match_collection_data(test)
+            end
+          end
+
+          if test.error?
+            it 'raises an error' do
+              expect(results).to be_a(Mongo::Error)
+            end
+          else
+            it 'returns the correct result' do
+              expect(results).to match_operation_result(test)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/{mongo → spec_tests}/sdam_monitoring_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe 'SDAM Monitoring' do
   include Mongo::SDAM
@@ -7,7 +7,7 @@ describe 'SDAM Monitoring' do
 
     spec = Mongo::SDAM::Spec.new(file)
 
-    context(spec.description) do
+    context("#{spec.description} (#{file.sub(%r'.*support/sdam_monitoring/', '')})") do
 
       before(:all) do
         @client = Mongo::Client.new([], heartbeat_frequency: 100, connect_timeout: 0.1)
@@ -35,10 +35,11 @@ describe 'SDAM Monitoring' do
               server ||= Mongo::Server.new(
                            Mongo::Address.new(response.address),
                            @client.cluster,
-                           @client.instance_variable_get(:@monitoring),
+                           @client.send(:monitoring),
                            @client.cluster.send(:event_listeners),
                            @client.cluster.options
                          )
+
               monitor = server.instance_variable_get(:@monitor)
               description = monitor.inspector.run(server.description, response.ismaster, 0.5)
               monitor.instance_variable_set(:@description, description)

data/spec/{mongo → spec_tests}/sdam_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe 'Server Discovery and Monitoring' do
   include Mongo::SDAM
@@ -7,11 +7,10 @@ describe 'Server Discovery and Monitoring' do
 
     spec = Mongo::SDAM::Spec.new(file)
 
-    context(spec.description) do
+    context("#{spec.description} (#{file.sub(%r'.*support/sdam/', '')})") do
 
       before(:all) do
-        @client = Mongo::Client.new([])
-        @client.send(:create_from_uri, spec.uri_string)
+        @client = Mongo::Client.new(spec.uri_string)
         client_options = @client.instance_variable_get(:@options)
         @client.instance_variable_set(:@options, client_options.merge(heartbeat_frequency: 100, connect_timeout: 0.1))
         @client.cluster.instance_variable_set(:@options, client_options.merge(heartbeat_frequency: 100, connect_timeout: 0.1))
@@ -33,7 +32,7 @@ describe 'Server Discovery and Monitoring' do
                 server = Mongo::Server.new(
                     Mongo::Address.new(response.address),
                     @client.cluster,
-                    @client.instance_variable_get(:@monitoring),
+                    @client.send(:monitoring),
                     @client.cluster.send(:event_listeners),
                     @client.cluster.options
                 )
@@ -94,8 +93,9 @@ describe 'Server Discovery and Monitoring' do
 
             it 'raises an UnsupportedFeatures error' do
               expect {
-                Mongo::ServerSelector.get(mode: :primary).select_server(@client.cluster)
-                Mongo::ServerSelector.get(mode: :secondary).select_server(@client.cluster)
+                p = Mongo::ServerSelector.get(mode: :primary).select_server(@client.cluster)
+                s = Mongo::ServerSelector.get(mode: :secondary).select_server(@client.cluster)
+                raise "UnsupportedFeatures not raised but we got #{p.inspect} as primary and #{s.inspect} as secondary"
               }.to raise_exception(Mongo::Error::UnsupportedFeatures)
             end
           end

data/spec/support/authorization.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2017 MongoDB, Inc.
+# Copyright (C) 2009-2018 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -85,6 +85,13 @@ BASE_OPTIONS = {
                   write: WRITE_CONCERN,
                   heartbeat_frequency: 20,
                   max_read_retries: 5,
+                  # The test suite seems to perform a number of operations
+                  # requiring server selection. Hence a timeout of 1 here,
+                  # together with e.g. a misconfigured replica set,
+                  # means the test suite hangs for about 4 seconds before
+                  # failing.
+                  # Server selection timeout of 1 is insufficient for evergreen.
+                  server_selection_timeout: 2,
                   wait_queue_timeout: 2,
                   connect_timeout: 3,
                   max_idle_time: 5
@@ -129,14 +136,19 @@ ROOT_USER = Mongo::Auth::User.new(
 #
 # @since 2.0.0
 TEST_USER = Mongo::Auth::User.new(
-  database: Mongo::Database::ADMIN,
+  database: TEST_DB,
   user: 'test-user',
   password: 'password',
   roles: [
     { role: Mongo::Auth::Roles::READ_WRITE, db: TEST_DB },
     { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: TEST_DB },
     { role: Mongo::Auth::Roles::READ_WRITE, db: 'invalid_database' },
-    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'invalid_database' }
+    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'invalid_database' },
+		{ role: Mongo::Auth::Roles::READ_WRITE, db: 'hr' },           # For transactions examples
+		{ role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'hr' },       # For transactions examples
+		{ role: Mongo::Auth::Roles::READ_WRITE, db: 'reporting' },    # For transactions examples
+		{ role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'reporting' } # For transactions examples
+
   ]
 )
 
@@ -206,9 +218,9 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
 SUBSCRIBED_CLIENT = Mongo::Client.new(
     ADDRESSES,
     TEST_OPTIONS.merge(
-        database: TEST_DB,
-        user: TEST_USER.name,
-        password: TEST_USER.password)
+      database: TEST_DB,
+      user: TEST_USER.name,
+      password: TEST_USER.password)
 )
 SUBSCRIBED_CLIENT.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber)
 AUTHROIZED_CLIENT_WITH_RETRY_WRITES.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber)

data/spec/support/change_streams.rb

@@ -0,0 +1,265 @@
+# Copyright (C) 2014-2018 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+RSpec::Matchers.define :match_result do |test|
+  match do |actual|
+    test.match_result?(actual)
+  end
+end
+
+RSpec::Matchers.define :match_commands do |test|
+  match do |actual|
+    test.match_commands?(actual)
+  end
+end
+
+require 'support/change_streams/operation'
+
+module Mongo
+  module ChangeStreams
+    class Spec
+
+      # @return [ String ] description The spec description.
+      #
+      # @since 2.6.0
+      attr_reader :description
+
+      # Instantiate the new spec.
+      #
+      # @example Create the spec.
+      #   Spec.new(file)
+      #
+      # @param [ String ] file The name of the file.
+      #
+      # @since 2.6.0
+      def initialize(file)
+        file = File.new(file)
+        @spec = YAML.load(ERB.new(file.read).result)
+        file.close
+        @description = File.basename(file)
+        @spec_tests = @spec['tests']
+        @coll1 = @spec['collection_name']
+        @coll2 = @spec['collection2_name']
+        @db1 = @spec['database_name']
+        @db2 = @spec['database2_name']
+      end
+
+      # Get a list of ChangeStreamsTests for each test definition.
+      #
+      # @example Get the list of ChangeStreamsTests.
+      #   spec.tests
+      #
+      # @return [ Array<ChangeStreamsTest> ] The list of ChangeStreamsTests.
+      #
+      # @since 2.0.0
+      def tests
+        @spec_tests.map do |test|
+          ChangeStreamsTest.new(test, @coll1, @coll2, @db1, @db2)
+        end
+      end
+
+      class ChangeStreamsTest
+        # The test description.
+        #
+        # @return [ String ] description The test description.
+        #
+        # @since 2.0.0
+        attr_reader :description
+
+        def configuration_satisfied?(client)
+          server_version_satisfied?(client) && topology_satisfied?
+        end
+
+        def initialize(test, coll1, coll2, db1, db2)
+          @description = test['description']
+          @min_server_version = test['minServerVersion']
+          @max_server_version = test['maxServerVersion']
+          @target_type = test['target']
+          @topologies = test['topology']
+          @pipeline = test['changeStreamPipeline'] || []
+          @options = test['changeStreamOptions'] || {}
+          @operations = test['operations'].map { |op| Operation.new(op) }
+          @expectations = test['expectations']
+          @result = test['result']
+          @coll1_name = coll1
+          @coll2_name = coll2
+          @db1_name = db1
+          @db2_name = db2
+        end
+
+        def setup_test
+          @global_client = ADMIN_AUTHORIZED_TEST_CLIENT.use('admin')
+
+          @db1 = @global_client.use(@db1_name).database.tap(&:drop)
+          @db2 = @global_client.use(@db2_name).database.tap(&:drop)
+
+          @db1[@coll1_name].create
+          @db2[@coll2_name].create
+
+          client = ADMIN_AUTHORIZED_TEST_CLIENT.with(
+            database: @db1_name,
+            app_name: 'this is used solely to force the new client to create its own cluster')
+          client.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber.clear_events!)
+
+          @target = case @target_type
+                   when 'client'
+                     client
+                   when 'database'
+                     client.database
+                   when 'collection'
+                     client[@coll1_name]
+                   end
+        end
+
+        def run
+          change_stream = begin
+            @target.watch(@pipeline, @options)
+          rescue Mongo::Error::OperationFailure => e
+            return {
+              result: { 'error' => { 'code' => e.code } },
+              events: events
+            }
+          end
+
+          @operations.each do |op|
+            op.execute(@db1, @db2)
+          end
+
+          changes = [].tap do |changes|
+                           next unless @result['success']
+
+                           unless @result['success'].empty?
+                             change_stream.take_while do |change|
+                               changes << change
+                               changes.length < @result['success'].length
+                             end
+                           end
+
+                           change_stream.close
+                         end
+
+          {
+            result: { 'success' => changes },
+            events: events,
+          }
+        end
+
+        def teardown_test
+          @global_client.close
+          @db1.drop
+          @db2.drop
+        end
+
+        def match_result?(result)
+          case @result.first.first
+          when 'success'
+            match_success?(result)
+          when 'error'
+            @result == result
+          end
+        end
+
+        def match_commands?(actual)
+          @expectations.each_with_index.all? do |e, i|
+            actual[i] && match?(e, actual[i])
+          end
+        end
+
+        private
+
+        def events
+          EventSubscriber.started_events.reduce([]) do |evs, e|
+            next evs if [:saslStart, :saslContinue, :killCursors].include?(e.command_name)
+
+            evs << {
+              'command_started_event' => {
+                'command' => e.command,
+                'command_name' => e.command_name.to_s,
+                'database_name' => e.database_name
+              }
+            }
+          end
+        end
+
+        def match_success?(result)
+          return false unless result['success']
+          match?(@result['success'], result['success'])
+        end
+
+        def match?(expected, actual)
+          return !!actual if expected.to_s == '42'
+          return match_array?(expected, actual) if expected.is_a?(Array)
+          return match_hash?(expected, actual) if expected.is_a?(Hash)
+          expected == actual
+        end
+
+        def match_array?(expected, actual)
+          return false unless actual.is_a?(Array)
+
+          expected.each_with_index.all? do |e, i|
+            actual[i] && match?(e, actual[i])
+          end
+        end
+
+        def match_hash?(expected, actual)
+          return false unless actual.is_a?(Hash)
+
+          expected.all? do |k, v|
+            if v.is_a?(Hash) && !v.empty?
+              case v.first.first
+              when '$numberInt'
+                v = v.first.last.to_i
+              end
+            end
+
+            actual[k] && match?(v, actual[k])
+          end
+        end
+
+        def topology_satisfied?
+          @topologies.any? do |topology|
+            case topology
+            when 'single'
+              standalone?
+            when 'replicaset'
+              replica_set?
+            when 'sharded'
+              sharded?
+            else
+              false
+            end
+          end
+        end
+
+        def server_version_satisfied?(client)
+          lower_bound_satisfied?(client) && upper_bound_satisfied?(client)
+        end
+
+        def server_version(client)
+          @server_version ||= client.database.command(buildInfo: 1).first['version']
+        end
+
+        def upper_bound_satisfied?(client)
+          return true unless @max_server_version
+          server_version(client) <= @max_server_version
+        end
+
+        def lower_bound_satisfied?(client)
+          return true unless @min_server_version
+          @min_server_version <= server_version(client)
+        end
+      end
+    end
+  end
+end