mongo 2.7.0 → 2.7.1

data/spec/support/common_shortcuts.rb

@@ -1,12 +1,78 @@
 module CommonShortcuts
-  # Declares a topology double, which is configured to accept summary
-  # calls as those are used in SDAM event creation
-  def declare_topology_double
-    let(:topology) do
-      double('topology').tap do |topology|
-        allow(topology).to receive(:summary)
+  module ClassMethods
+    # Declares a topology double, which is configured to accept summary
+    # calls as those are used in SDAM event creation
+    def declare_topology_double
+      let(:topology) do
+        double('topology').tap do |topology|
+          allow(topology).to receive(:summary)
+        end
       end
     end
   end
-end
 
+  module InstanceMethods
+    def kill_all_server_sessions
+      begin
+        ClientRegistry.instance.global_client('root_authorized').command(killAllSessions: [])
+      # killAllSessions also kills the implicit session which the driver uses
+      # to send this command, as a result it always fails
+      rescue Mongo::Error::OperationFailure => e
+        # "operation was interrupted"
+        unless e.code == 11601
+          raise
+        end
+      end
+    end
+
+    def wait_for_all_servers(cluster)
+      # Cluster waits for initial round of sdam until the primary
+      # is discovered, which means by the time a connection is obtained
+      # here some of the servers in the topology may still be unknown.
+      # This messes with event expectations below. Therefore, wait for
+      # all servers in the topology to be checked.
+      #
+      # This wait here assumes all addresses specified for the test
+      # suite are for working servers of the cluster; if this is not
+      # the case, this test will fail due to exceeding the general
+      # test timeout eventually.
+      while cluster.servers_list.any? { |server| server.unknown? }
+        warn "Waiting for unknown servers in #{cluster.servers}"
+        sleep 0.25
+      end
+    end
+
+    def make_server(mode, options = {})
+      tags = options[:tags] || {}
+      average_round_trip_time = options[:average_round_trip_time] || 0
+
+      ismaster = {
+        'ismaster' => mode == :primary,
+        'secondary' => mode == :secondary,
+        'arbiterOnly' => mode == :arbiter,
+        'isreplicaset' => mode == :ghost,
+        'hidden' => mode == :other,
+        'tags' => tags,
+        'ok' => 1,
+        'minWireVersion' => 2, 'maxWireVersion' => 8,
+      }
+      if [:primary, :secondary, :arbiter, :other].include?(mode)
+        ismaster['setName'] = 'mongodb_set'
+      end
+
+      listeners = Mongo::Event::Listeners.new
+      monitoring = Mongo::Monitoring.new
+      address = options[:address]
+
+      cluster = double('cluster')
+      allow(cluster).to receive(:topology).and_return(topology)
+      allow(cluster).to receive(:app_metadata)
+      allow(cluster).to receive(:options).and_return({})
+      server = Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
+      description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
+      server.tap do |s|
+        allow(s).to receive(:description).and_return(description)
+      end
+    end
+  end
+end

data/spec/support/connection_string.rb

@@ -214,9 +214,6 @@ module Mongo
         # Replica Set Options
         'replicaset' => :replica_set,
 
-        # Auth Source
-        'authsource' => :auth_source,
-
         # Timeout Options
         'connecttimeoutms' => :connect_timeout,
         'sockettimeoutms' => :socket_timeout,

data/spec/support/constraints.rb

@@ -23,27 +23,37 @@ module Constraints
     end
   end
 
-  def require_sessions
+  def min_server_fcv(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "FCV can only be major.minor: #{version}"
+    end
+
+    before do
+      unless ClusterConfig.instance.fcv_ish >= version
+        skip "FCV #{version} or higher required, we have #{ClusterConfig.instance.fcv_ish} (server #{ClusterConfig.instance.server_version})"
+      end
+    end
+  end
+
+  def max_server_fcv(version)
+    unless version =~ /^\d+\.\d+$/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
+    end
+
     before do
-      unless sessions_enabled?
-        skip 'Sessions are not enabled'
+      if version < ClusterConfig.instance.fcv_ish
+        skip "FCV #{version} or lower required, we have #{ClusterConfig.instance.fcv_ish} (server #{ClusterConfig.instance.server_version})"
       end
     end
   end
 
   def require_topology(*topologies)
-    topologies = topologies.map { |t| t.to_s }
-    invalid_topologies = topologies - %w(single replica_set sharded)
+    invalid_topologies = topologies - [:single, :replica_set, :sharded]
     unless invalid_topologies.empty?
       raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
     end
     before do
-      topology = authorized_client.cluster.topology.class.name.sub(/.*::/, '')
-      topology = topology.gsub(/([A-Z])/) { |match| '_' + match.downcase }.sub(/^_/, '')
-      if topology =~ /^replica_set/
-        topology = 'replica_set'
-      end
-      unless topologies.include?(topology)
+      unless topologies.include?(topology = ClusterConfig.instance.topology)
         skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
       end
     end
@@ -51,32 +61,29 @@ module Constraints
 
   def max_example_run_time(timeout)
     around do |example|
-      TimeoutInterrupt.timeout(timeout) do
+      TimeoutInterrupt.timeout(timeout, TimeoutInterrupt::Error.new("Test execution terminated after #{timeout} seconds")) do
         example.run
       end
     end
   end
 
   def require_transaction_support
-    min_server_version '4.0'
+    min_server_fcv '4.0'
     require_topology :replica_set
   end
 
-  def require_scram_sha_256_support
+  def require_ssl
     before do
-      $mongo_server_features ||= begin
-        scanned_client_server!.features
-      end
-      unless $mongo_server_features.scram_sha_256_enabled?
-        skip "SCRAM SHA 256 is not enabled on the server"
+      unless SpecConfig.instance.ssl?
+        skip "SSL not enabled"
       end
     end
   end
 
-  def require_ssl
+  def require_local_tls
     before do
-      unless SpecConfig.instance.ssl?
-        skip "SSL not enabled"
+      unless SpecConfig.instance.ssl? && !SpecConfig.instance.ci?
+        skip 'Not running locally with TLS enabled'
       end
     end
   end
@@ -88,4 +95,62 @@ module Constraints
       end
     end
   end
+
+  def require_compression
+    before do
+      if SpecConfig.instance.compressors.nil?
+        skip "Compression is not enabled"
+      end
+    end
+  end
+
+  def require_no_compression
+    before do
+      if SpecConfig.instance.compressors
+        skip "Compression is enabled"
+      end
+    end
+  end
+
+  def ruby_version_gte(version)
+    before do
+      if RUBY_VERSION < version
+        skip "Ruby version #{version} or higher required"
+      end
+    end
+  end
+
+  def ruby_version_lt(version)
+    before do
+      if RUBY_VERSION >= version
+        skip "Ruby version less than #{version} required"
+      end
+    end
+  end
+
+  def require_auth
+    before do
+      unless ENV['AUTH'] == 'auth' || ClusterConfig.instance.auth_enabled?
+        skip "Auth required"
+      end
+    end
+  end
+
+  def require_no_auth
+    before do
+      if ENV['AUTH'] == 'auth' || ClusterConfig.instance.auth_enabled?
+        skip "Auth not allowed"
+      end
+    end
+  end
+
+  # Can the driver specify a write concern that won't be overridden?
+  # (mongos 4.0+ overrides the write concern)
+  def require_set_write_concern
+    before do
+      if ClusterConfig.instance.topology == :sharded && ClusterConfig.instance.short_server_version >= '4.0'
+        skip "mongos 4.0+ overrides write concern"
+      end
+    end
+  end
 end

data/spec/support/crud.rb

@@ -87,7 +87,8 @@ module Mongo
 
       def lower_bound_satisfied?(client)
         return true unless @min_server_version
-        @min_server_version <= client.database.command(buildInfo: 1).first['version']
+        #@min_server_version <= client.database.command(buildInfo: 1).first['version']
+        @min_server_version <= ClusterConfig.instance.fcv_ish
       end
     end
 

data/spec/support/shared/server_selector.rb

@@ -1,31 +1,3 @@
-def make_server(mode, options = {})
-  tags = options[:tags] || {}
-  average_round_trip_time = options[:average_round_trip_time] || 0
-
-  ismaster = {
-              'setName' => 'mongodb_set',
-              'ismaster' => mode == :primary,
-              'secondary' => mode != :primary,
-              'tags' => tags,
-              'ok' => 1,
-              'minWireVersion' => 2, 'maxWireVersion' => 8,
-              }
-
-  listeners = Mongo::Event::Listeners.new
-  monitoring = Mongo::Monitoring.new
-  address = options[:address]
-
-  cluster = double('cluster')
-  allow(cluster).to receive(:topology).and_return(topology)
-  allow(cluster).to receive(:app_metadata)
-  allow(cluster).to receive(:options).and_return({})
-  server = Mongo::Server.new(address, cluster, monitoring, listeners, SpecConfig.instance.test_options)
-  description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
-  server.tap do |s|
-    allow(s).to receive(:description).and_return(description)
-  end
-end
-
 shared_context 'server selector' do
 
   let(:max_staleness) { nil }

data/spec/support/shared/session.rb

@@ -1,7 +1,7 @@
 shared_examples 'an operation using a session' do
 
   describe 'operation execution' do
-    min_server_version '3.6'
+    min_server_fcv '3.6'
     require_topology :replica_set, :sharded
 
     context 'when the session is created from the same client used for the operation' do
@@ -86,7 +86,7 @@ end
 shared_examples 'a failed operation using a session' do
 
   context 'when the operation fails' do
-    min_server_version '3.6'
+    min_server_fcv '3.6'
     require_topology :replica_set, :sharded
 
     let!(:before_last_use) do
@@ -127,7 +127,8 @@ shared_examples 'an explicit session with an unacknowledged write' do
     EventSubscriber.clear_events!
   end
 
-  context 'when sessions are supported', if: sessions_enabled? do
+  context 'when sessions are supported' do
+    min_server_fcv '3.6'
 
     let(:session) do
       client.start_session
@@ -139,7 +140,8 @@ shared_examples 'an explicit session with an unacknowledged write' do
     end
   end
 
-  context 'when sessions are not supported', if: !sessions_enabled? do
+  context 'when sessions are not supported' do
+    min_server_fcv '3.6'
 
     let(:session) do
       double('session').tap do |s|
@@ -160,7 +162,8 @@ shared_examples 'an implicit session with an unacknowledged write' do
     EventSubscriber.clear_events!
   end
 
-  context 'when sessions are supported', if: sessions_enabled? do
+  context 'when sessions are supported' do
+    min_server_fcv '3.6'
 
     it 'does not add a session id to the operation' do
       operation
@@ -168,7 +171,8 @@ shared_examples 'an implicit session with an unacknowledged write' do
     end
   end
 
-  context 'when sessions are not supported', if: !sessions_enabled? do
+  context 'when sessions are not supported' do
+    min_server_fcv '3.6'
 
     it 'does not add a session id to the operation' do
       operation
@@ -183,7 +187,9 @@ shared_examples 'an operation supporting causally consistent reads' do
     subscribed_client
   end
 
-  context 'when connected to a standalone', if: sessions_enabled? && standalone? do
+  context 'when connected to a standalone' do
+    min_server_fcv '3.6'
+    require_topology :single
 
     context 'when the collection specifies a read concern' do
 
@@ -267,7 +273,7 @@ shared_examples 'an operation supporting causally consistent reads' do
   end
 
   context 'when connected to replica set or sharded cluster' do
-    min_server_version '3.6'
+    min_server_fcv '3.6'
     require_topology :replica_set, :sharded
 
     context 'when the collection specifies a read concern' do
@@ -623,7 +629,7 @@ shared_examples 'an operation updating cluster time' do
   context 'when the command is run once' do
 
     context 'when the server is version 3.6' do
-      min_server_version '3.6'
+      min_server_fcv '3.6'
 
       context 'when the cluster is sharded or a replica set' do
         require_topology :replica_set, :sharded
@@ -689,7 +695,7 @@ shared_examples 'an operation updating cluster time' do
     end
 
     context 'when the cluster is sharded or a replica set' do
-      min_server_version '3.6'
+      min_server_fcv '3.6'
       require_topology :replica_set, :sharded
 
       context 'when the session cluster time is advanced' do
@@ -720,6 +726,8 @@ shared_examples 'an operation updating cluster time' do
         context 'when the advanced cluster time is not greater than the existing cluster time' do
 
           let(:advanced_cluster_time) do
+            expect(reply_cluster_time[Mongo::Cluster::CLUSTER_TIME].increment > 0).to be true
+
             new_timestamp = BSON::Timestamp.new(reply_cluster_time[Mongo::Cluster::CLUSTER_TIME].seconds,
                                                 reply_cluster_time[Mongo::Cluster::CLUSTER_TIME].increment - 1)
             new_cluster_time = reply_cluster_time.dup
@@ -746,7 +754,9 @@ shared_examples 'an operation updating cluster time' do
       end
     end
 
-    context 'when the server is a standalone', if: (standalone? && sessions_enabled?) do
+    context 'when the server is a standalone' do
+      min_server_fcv '3.6'
+      require_topology :single
 
       let(:before_cluster_time) do
         client.cluster.cluster_time
@@ -765,7 +775,8 @@ shared_examples 'an operation updating cluster time' do
     end
   end
 
-  context 'when the server is less than version 3.6', if: !sessions_enabled? do
+  context 'when the server is less than version 3.6' do
+    max_server_version '3.4'
 
     let(:before_cluster_time) do
       client.cluster.cluster_time
@@ -780,7 +791,7 @@ shared_examples 'an operation updating cluster time' do
 end
 
 shared_examples 'an operation not using a session' do
-  require_sessions
+  min_server_fcv '3.6'
 
   describe 'operation execution' do
 
@@ -850,7 +861,7 @@ shared_examples 'an operation not using a session' do
 end
 
 shared_examples 'a failed operation not using a session' do
-  require_sessions
+  min_server_fcv '3.6'
 
   context 'when the operation fails' do
 

data/spec/support/transactions.rb

@@ -61,11 +61,7 @@ module Mongo
       # @since 2.6.0
       def tests
         @transaction_tests.map do |test|
-          if test['skipReason']
-            nil
-          else
-            Proc.new { Mongo::Transactions::TransactionsTest.new(@data, test, self) }
-          end
+          Proc.new { Mongo::Transactions::TransactionsTest.new(@data, test, self) }
         end.compact
       end
 
@@ -100,6 +96,7 @@ module Mongo
       attr_reader :expectations
 
       attr_reader :expected_results
+      attr_reader :skip_reason
 
       # Instantiate the new CRUDTest.
       #
@@ -122,6 +119,7 @@ module Mongo
         @fail_point = test['failPoint']
         @operations = test['operations']
         @expectations = test['expectations']
+        @skip_reason = test['skipReason']
         @outcome = test['outcome']
         @expected_results = @operations.map do |o|
           result = o['result']
@@ -259,9 +257,7 @@ module Mongo
         coll = support_client[@spec.collection_name]
         coll.database.drop
         coll.with(write: { w: :majority }).drop
-        support_client.command(
-          { create: @spec.collection_name },
-          { write_concern: { w: :majority } })
+        support_client.command(create: @spec.collection_name, writeConcern: { w: :majority })
 
         coll.with(write: { w: :majority }).insert_many(@data) unless @data.empty?
         admin_support_client.command(@fail_point) if @fail_point