mongo 2.9.2 → 2.10.0.rc0

data/spec/support/crud/spec.rb

@@ -16,6 +16,7 @@ module Mongo
 
         # Since Ruby driver binds a client to a database, change the
         # database name in the spec to the one we are using
+        contents.sub!(/"crud-tests"/, '"ruby-driver"')
         contents.sub!(/"retryable-reads-tests"/, '"ruby-driver"')
         contents.sub!(/"transaction-tests"/, '"ruby-driver"')
         contents.sub!(/"withTransaction-tests"/, '"ruby-driver"')
@@ -60,7 +61,7 @@ module Mongo
       # Get a list of Test instances, one for each test definition.
       def tests
         @tests.map do |test|
-          Mongo::CRUD::CRUDTest.new(@data, test)
+          Mongo::CRUD::CRUDTest.new(self, @data, test)
         end
       end
     end

data/spec/support/crud/test.rb

@@ -4,7 +4,7 @@ module Mongo
     # Represents a single CRUD test.
     #
     # @since 2.0.0
-    class CRUDTest
+    class CRUDTest < CRUDTestBase
 
       # The test description.
       #
@@ -25,12 +25,14 @@ module Mongo
       # collection_name as configured in the YAML file. Alternatively data
       # can be a map of collection names to arrays of hashes.
       #
+      # @param [ Crud::Spec ] crud_spec The top level YAML specification object.
       # @param [ Hash | Array<Hash> ] data The documents the collection
       #   must have before the test runs.
       # @param [ Hash ] test The test specification.
       #
       # @since 2.0.0
-      def initialize(data, test)
+      def initialize(crud_spec, data, test)
+        @spec = crud_spec
         @data = data
         if test['failPoint']
           @fail_point_command = FAIL_POINT_BASE_COMMAND.merge(test['failPoint'])
@@ -39,10 +41,13 @@ module Mongo
         @client_options = Utils.convert_client_options(test['clientOptions'] || {})
         if test['operations']
           @operations = test['operations'].map do |op_spec|
-            Operation.get(op_spec)
+            Operation.new(self, op_spec)
           end
         else
-          @operations = [Operation.get(test['operation'], test['outcome'])]
+          @operations = [Operation.new(self, test['operation'], test['outcome'])]
+        end
+        if test['outcome']
+          @outcome = Mongo::CRUD::Outcome.new(test['outcome'])
         end
         @expectations = test['expectations']
       end
@@ -59,6 +64,8 @@ module Mongo
       # The expected command monitoring events
       attr_reader :expectations
 
+      attr_reader :outcome
+
       # Run the test.
       #
       # The specified number of operations are executed, so that the
@@ -71,22 +78,11 @@ module Mongo
       # @return [ Result, Array<Hash> ] The result(s) of running the test.
       #
       # @since 2.0.0
-      def run(spec, client, num_ops)
+      def run(client, num_ops)
         result = nil
         1.upto(num_ops) do |i|
           operation = @operations[i-1]
-          target = case operation.object
-          when 'collection'
-            client[spec.collection_name]
-          when 'database'
-            client.database
-          when 'client'
-            client
-          when 'gridfsbucket'
-            client.database.fs
-          else
-            raise "Unknown target #{operation.object}"
-          end
+          target = resolve_target(client, operation)
           result = operation.execute(target)
         end
         result
@@ -98,8 +94,10 @@ module Mongo
 
       def setup_test(spec, client)
         clear_fail_point(client)
-        if @data.is_a?(Array)
-          collection = client[spec.collection_name]
+        if @data.nil?
+          # nothing to do
+        elsif @data.is_a?(Array)
+          collection = client[spec.collection_name, write_concern: {w: :majority}]
           collection.delete_many
           collection.insert_many(@data)
         elsif @data.is_a?(Hash)
@@ -113,10 +111,10 @@ module Mongo
         else
           raise "Unknown type of data: #{@data}"
         end
-        set_up_fail_point(client)
+        setup_fail_point(client)
       end
 
-      def set_up_fail_point(client)
+      def setup_fail_point(client)
         if @fail_point_command
           client.use(:admin).command(@fail_point_command)
         end
@@ -128,13 +126,12 @@ module Mongo
         end
       end
 
-      private
-
-      def actual_collection_data
-        if expected_outcome.collection_data?
-          collection_name = expected_outcome.collection_name || @collection.name
-          @collection.database[collection_name].find.to_a
+      def actual_collection_contents(client)
+        unless @spec.collection_name
+          raise ArgumentError, 'Spec does not specify a global collection'
         end
+
+        client[@spec.collection_name, read_concern: {level: :majority}].find.to_a
       end
     end
   end

data/spec/support/crud/test_base.rb

@@ -0,0 +1,22 @@
+module Mongo
+  module CRUD
+
+    class CRUDTestBase
+
+      def resolve_target(client, operation)
+        case operation.object
+        when 'collection'
+          client[@spec.collection_name].with(operation.collection_options)
+        when 'database'
+          client.database
+        when 'client'
+          client
+        when 'gridfsbucket'
+          client.database.fs
+        else
+          raise "Unknown target #{operation.object}"
+        end
+      end
+    end
+  end
+end

data/spec/support/crud/verifier.rb

@@ -67,7 +67,13 @@ module Mongo
       end
 
       def verify_command_started_event_count(expected_events, actual_events)
-        expect(actual_events.length).to eq(expected_events.length)
+        if actual_events.length != expected_events.length
+          raise RSpec::Expectations::ExpectationNotMetError.new, <<-EOT
+Expected #{expected_events.length} events, got #{actual_events.length} events.
+Expected events: #{expected_events.pretty_inspect}
+Actual events: #{actual_events.pretty_inspect}
+EOT
+        end
       end
 
       def verify_command_started_event(expected_events, actual_events, i)
@@ -117,6 +123,14 @@ module Mongo
         when nil
           expect(actual).to be nil
         when Hash
+          if actual.is_a?(Hash) && actual['error'] &&
+            !expected.keys.any? { |key| key.start_with?('error') }
+          then
+            raise RSpec::Expectations::ExpectationNotMetError.new,
+              "Expected operation not to fail but it failed: #{actual.inspect}"
+          end
+          expect(actual).to be_a(Hash)
+
           expected.each do |k, v|
             case k
             when 'errorContains'

data/spec/support/event_subscriber.rb

@@ -44,6 +44,18 @@ class EventSubscriber
       end
     end
 
+    # Locates command stated events for the specified command name,
+    # asserts that there is exactly one such event, and returns it.
+    def single_command_started_event(command_name)
+      events = started_events.select do |event|
+        event.command[command_name]
+      end
+      if events.length != 1
+        raise "Expected a single #{command_name} event but we have #{events.length}"
+      end
+      events.first
+    end
+
     # Cache the failed event.
     #
     # @param [ Event ] event The event.

data/spec/support/sdam_formatter_integration.rb

@@ -1,3 +1,5 @@
+$sdam_formatter_lock = Mutex.new
+
 module SdamFormatterIntegration
   def log_entries
     @log_entries ||= []
@@ -10,16 +12,20 @@ module SdamFormatterIntegration
   module_function :clear_log_entries
 
   def assign_log_entries(example_id)
-    @log_entries_by_example_id ||= {}
-    @log_entries_by_example_id[example_id] ||= []
-    @log_entries_by_example_id[example_id] += log_entries
-    clear_log_entries
+    $sdam_formatter_lock.synchronize do
+      @log_entries_by_example_id ||= {}
+      @log_entries_by_example_id[example_id] ||= []
+      @log_entries_by_example_id[example_id] += log_entries
+      clear_log_entries
+    end
   end
   module_function :assign_log_entries
 
   def example_log_entries(example_id)
-    @log_entries_by_example_id ||= {}
-    @log_entries_by_example_id[example_id]
+    $sdam_formatter_lock.synchronize do
+      @log_entries_by_example_id ||= {}
+      @log_entries_by_example_id[example_id]
+    end
   end
   module_function :example_log_entries
 

data/spec/support/shared/server_selector.rb

@@ -10,6 +10,16 @@ shared_context 'server selector' do
   end
   let(:primary) { make_server(:primary) }
   let(:secondary) { make_server(:secondary) }
+  let(:mongos) do
+    make_server(:mongos).tap do |server|
+      expect(server.mongos?).to be true
+    end
+  end
+  let(:unknown) do
+    make_server(:unknown).tap do |server|
+      expect(server.unknown?).to be true
+    end
+  end
   let(:options) { { :mode => name, :tag_sets => tag_sets, max_staleness: max_staleness } }
   let(:selector) { described_class.new(options) }
   let(:monitoring) do

data/spec/support/shared/session.rb

@@ -141,15 +141,14 @@ shared_examples 'an explicit session with an unacknowledged write' do
   end
 
   context 'when sessions are not supported' do
-    min_server_fcv '3.6'
+    max_server_version '3.4'
 
     let(:session) do
-      double('session').tap do |s|
-        allow(s).to receive(:validate!)
-      end
+      nil
     end
 
     it 'does not add a session id to the operation' do
+      expect(Mongo::Session).not_to receive(:new)
       operation
       expect(EventSubscriber.started_events.collect(&:command).collect { |cmd| cmd['lsid'] }.compact).to be_empty
     end
@@ -172,7 +171,7 @@ shared_examples 'an implicit session with an unacknowledged write' do
   end
 
   context 'when sessions are not supported' do
-    min_server_fcv '3.6'
+    max_server_version '3.4'
 
     it 'does not add a session id to the operation' do
       operation
@@ -604,6 +603,8 @@ shared_examples 'an operation supporting causally consistent reads' do
   end
 end
 
+# Since background operatons can advance cluster time, exact cluster time
+# comparisons sometimes fail. Work around this by retrying the tests.
 shared_examples 'an operation updating cluster time' do
 
   let(:cluster) do
@@ -619,7 +620,7 @@ shared_examples 'an operation updating cluster time' do
   end
 
   shared_examples_for 'does not update the cluster time of the cluster' do
-    it 'does not update the cluster time of the cluster' do
+    it 'does not update the cluster time of the cluster', retry: 3 do
       bct = before_cluster_time
       reply_cluster_time
       expect(client.cluster.cluster_time).to eq(before_cluster_time)
@@ -639,12 +640,12 @@ shared_examples 'an operation updating cluster time' do
           EventSubscriber.succeeded_events[-1].reply['$clusterTime']
         end
 
-        it 'updates the cluster time of the cluster' do
+        it 'updates the cluster time of the cluster', retry: 3 do
           rct = reply_cluster_time
           expect(cluster.cluster_time).to eq(rct)
         end
 
-        it 'updates the cluster time of the session' do
+        it 'updates the cluster time of the session', retry: 3 do
           rct = reply_cluster_time
           expect(session.cluster_time).to eq(rct)
         end
@@ -664,7 +665,7 @@ shared_examples 'an operation updating cluster time' do
 
         it_behaves_like 'does not update the cluster time of the cluster'
 
-        it 'does not update the cluster time of the session' do
+        it 'does not update the cluster time of the session', retry: 3 do
           reply_cluster_time
           expect(session.cluster_time).to be_nil
         end
@@ -718,7 +719,7 @@ shared_examples 'an operation updating cluster time' do
             new_cluster_time.merge(Mongo::Cluster::CLUSTER_TIME => new_timestamp)
           end
 
-          it 'includes the advanced cluster time in the second command' do
+          it 'includes the advanced cluster time in the second command', retry: 3 do
             expect(second_command_cluster_time).to eq(advanced_cluster_time)
           end
         end
@@ -734,7 +735,7 @@ shared_examples 'an operation updating cluster time' do
             new_cluster_time.merge(Mongo::Cluster::CLUSTER_TIME => new_timestamp)
           end
 
-          it 'does not advance the cluster time' do
+          it 'does not advance the cluster time', retry: 3 do
             expect(second_command_cluster_time).to eq(reply_cluster_time)
           end
         end
@@ -747,7 +748,7 @@ shared_examples 'an operation updating cluster time' do
           EventSubscriber.started_events[-1].command['$clusterTime']
         end
 
-        it 'includes the received cluster time in the second command' do
+        it 'includes the received cluster time in the second command', retry: 3 do
           reply_cluster_time
           expect(second_command_cluster_time).to eq(reply_cluster_time)
         end

data/spec/support/spec_config.rb

@@ -3,6 +3,8 @@ require 'singleton'
 class SpecConfig
   include Singleton
 
+  # NB: constructor should not do I/O as SpecConfig may be used by tests
+  # only loading the lite spec helper. Do I/O eagerly in accessor methods.
   def initialize
     @uri_options = {}
     if ENV['MONGODB_URI']
@@ -12,11 +14,7 @@ class SpecConfig
         @addresses = @mongodb_uri.servers
         @connect_options = { connect: :replica_set, replica_set: @uri_options[:replica_set] }
       elsif @uri_options[:connect] == :sharded || ENV['TOPOLOGY'] == 'sharded_cluster'
-        # See SERVER-16836 for why we can only use one host:port
-        if @mongodb_uri.servers.length > 1
-          warn "Using only the first mongos (#{@mongodb_uri.servers.first})"
-        end
-        @addresses = [ @mongodb_uri.servers.first ]
+        @addresses = @mongodb_uri.servers
         @connect_options = { connect: :sharded }
       elsif @uri_options[:connect] == :direct
         @addresses = @mongodb_uri.servers
@@ -45,40 +43,50 @@ class SpecConfig
         @uri_tls_options[k] = v
       end
     end
+  end
 
-    if @addresses.nil?
-      # Discover deployment topology
+  attr_reader :uri_options, :connect_options
+
+  def addresses
+    @addresses ||= begin
       if @mongodb_uri
-        # TLS options need to be merged for evergreen due to
-        # https://github.com/10gen/mongo-orchestration/issues/268
-        client = Mongo::Client.new(@mongodb_uri.servers, Mongo::Options::Redacted.new(
-          server_selection_timeout: 5,
-        ).merge(@mongodb_uri.uri_options).merge(ssl_options))
-        @addresses = @mongodb_uri.servers
+        @mongodb_uri.servers
       else
-        client = Mongo::Client.new(['localhost:27017'], server_selection_timeout: 5)
+        client = Mongo::Client.new(['localhost:27017'], server_selection_timeout: 5.02)
+        client.cluster.next_primary
         @addresses = client.cluster.servers_list.map do |server|
           server.address.to_s
         end
+        client.close(true)
       end
-      client.cluster.next_primary
-      case client.cluster.topology.class.name
+    end
+  end
+
+  def connect_options
+    @connect_options ||= begin
+      # Discover deployment topology.
+      # TLS options need to be merged for evergreen due to
+      # https://github.com/10gen/mongo-orchestration/issues/268
+      client = Mongo::Client.new(addresses, Mongo::Options::Redacted.new(
+        server_selection_timeout: 5,
+      ).merge(ssl_options))
+      options = case client.cluster.topology.class.name
       when /Replica/
-        @connect_options = { connect: :replica_set, replica_set: client.cluster.topology.replica_set_name }
+        { connect: :replica_set, replica_set: client.cluster.topology.replica_set_name }
       when /Sharded/
-        @connect_options = { connect: :sharded }
+        { connect: :sharded }
       when /Single/
-        @connect_options = { connect: :direct }
+        { connect: :direct }
       when /Unknown/
         raise "Could not detect topology because the test client failed to connect to MongoDB deployment"
       else
         raise "Weird topology #{client.cluster.topology}"
       end
+      client.close(true)
+      options
     end
   end
 
-  attr_reader :uri_options, :addresses, :connect_options
-
   # Environment
 
   def ci?
@@ -325,16 +333,18 @@ EOT
 
   # Base test options.
   def base_test_options
+    uri_options = @uri_options || {}
     {
       max_pool_size: 1,
       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: ssl? ? 4.01 : 2.01,
+      server_selection_timeout: uri_options[:server_selection_timeout] || (ssl? ? 4.01 : 2.01),
       wait_queue_timeout: 2,
       connect_timeout: 3,
       max_idle_time: 5