mongo 2.11.0.rc0 → 2.11.0

data/spec/support/cluster_tools.rb

@@ -349,8 +349,6 @@ class ClusterTools
     end
   end
 
-  private
-
   def each_server(&block)
     admin_client.cluster.servers_list.each(&block)
   end
@@ -361,6 +359,8 @@ class ClusterTools
     end
   end
 
+  private
+
   def reset_server_states
     each_server do |server|
       server.unknown!

data/spec/support/cmap.rb

@@ -35,12 +35,9 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
-      def initialize(file)
-        @test = YAML.load(ERB.new(File::read(file)).result)
+      # @param [ String ] test_path The path to the file.
+      def initialize(test_path)
+        @test = YAML.load(File.read(test_path))
 
         @description = @test['description']
         @pool_options = Utils.snakeize_hash(process_options(@test['poolOptions']))
@@ -99,36 +96,43 @@ module Mongo
                       {
                         'type' => 'ConnectionCreated',
                         'connectionId' => event.connection_id,
+                        'address' => event.address,
                       }
                     when Mongo::Monitoring::Event::Cmap::ConnectionReady
                       {
                         'type' => 'ConnectionReady',
                         'connectionId' => event.connection_id,
+                        'address' => event.address,
                       }
                     when Mongo::Monitoring::Event::Cmap::ConnectionClosed
                       {
                         'type' => 'ConnectionClosed',
                         'connectionId' => event.connection_id,
                         'reason' => event.reason,
+                        'address' => event.address,
                       }
                     when Mongo::Monitoring::Event::Cmap::ConnectionCheckOutStarted
                       {
                         'type' => 'ConnectionCheckOutStarted',
-                    }
+                        'address' => event.address,
+                      }
                     when Mongo::Monitoring::Event::Cmap::ConnectionCheckOutFailed
                       {
                         'type' => 'ConnectionCheckOutFailed',
                         'reason' => event.reason,
+                        'address' => event.address,
                       }
                    when Mongo::Monitoring::Event::Cmap::ConnectionCheckedOut
                       {
                         'type' => 'ConnectionCheckedOut',
                         'connectionId' => event.connection_id,
+                        'address' => event.address,
                       }
                     when Mongo::Monitoring::Event::Cmap::ConnectionCheckedIn
                       {
                         'type' => 'ConnectionCheckedIn',
                         'connectionId' => event.connection_id,
+                        'address' => event.address,
                       }
                     when Mongo::Monitoring::Event::Cmap::PoolCleared
                       {

data/spec/support/command_monitoring.rb

@@ -134,6 +134,11 @@ module Mongo
         end
         if expected.keys.first == '$numberLong'
           converted = expected.values.first.to_i
+          if actual.is_a?(BSON::Int64)
+            actual = actual.value
+          elsif actual.is_a?(BSON::Int32)
+            return false
+          end
           (actual == converted) || actual >= 0
         else
           expected.each do |key, value|
@@ -192,16 +197,11 @@ module Mongo
 
       # Create the spec.
       #
-      # @example Create the spec.
-      #   Spec.new('/path/to/test')
-      #
-      # @param [ String ] file The yaml test file.
+      # @param [ String ] test_path The yaml test path.
       #
       # @since 2.1.0
-      def initialize(file)
-        file = File.new(file)
-        @spec = YAML.load(ERB.new(file.read).result)
-        file.close
+      def initialize(test_path)
+        @spec = YAML.load(File.read(test_path))
         @data = @spec['data']
         @tests = @spec['tests']
       end

data/spec/support/connection_string.rb

@@ -12,13 +12,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-RSpec::Matchers.define :have_hosts do |test|
+RSpec::Matchers.define :have_hosts do |test, hosts|
 
   match do |cl|
 
     def find_server(client, host)
-      client.cluster.instance_variable_get(:@servers).detect do |s|
-        s.address.host == host.host
+      client.cluster.servers_list.detect do |s|
+        if host.port
+          s.address.host == host.host && s.address.port == host.port
+        else
+          s.address.host == host.host
+        end
       end
     end
 
@@ -39,18 +43,19 @@ RSpec::Matchers.define :have_hosts do |test|
       server.address.instance_variable_get(:@resolver).class
     end
 
-    test.hosts.all? do |host|
+    hosts.all? do |host|
       server = find_server(cl, host)
-      match_host?(server, host) &&
-          match_port?(server, host) if server #&&
-          #match_address_family?(server, host) if server
+      server &&
+        match_host?(server, host) &&
+        match_port?(server, host) #&&
+        #match_address_family?(server, host)
     end
+  end
 
-    failure_message do |client|
-      "With URI: #{test.uri_string}\n" +
-          "Expected that test hosts: #{test.hosts} would match " +
-          "client hosts: #{cl.cluster.instance_variable_get(:@servers)}"
-    end
+  failure_message do |client|
+    "With URI: #{test.uri_string}\n" +
+        "Expected client hosts: #{client.cluster.instance_variable_get(:@servers)} " +
+        "to match #{hosts}"
   end
 end
 
@@ -102,17 +107,12 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
+      # @param [ String ] test_path The path to the file.
       #
       # @since 2.0.0
-      def initialize(file)
-        file = File.new(file)
-        @spec = YAML.load(ERB.new(file.read).result)
-        file.close
-        @description = File.basename(file)
+      def initialize(test_path)
+        @spec = YAML.load(File.read(test_path))
+        @description = File.basename(test_path)
       end
 
       def tests
@@ -148,6 +148,16 @@ module Mongo
         end
       end
 
+      def seeds
+        if @spec['seeds']
+          @seeds ||= (@spec['seeds'] || []).collect do |host|
+            Host.new(host)
+          end
+        else
+          nil
+        end
+      end
+
       def options
         @options ||= Options.new(@spec['options']) if @spec['options']
       end
@@ -171,6 +181,14 @@ module Mongo
       def raise_error?
         @spec['error']
       end
+
+      def read_concern_expectation
+        @spec['readConcern']
+      end
+
+      def write_concern_expectation
+        @spec['writeConcern']
+      end
     end
 
     class Host
@@ -185,9 +203,17 @@ module Mongo
       attr_reader :port
 
       def initialize(spec)
-        @spec = spec
-        @host = @spec['host']
-        @port = @spec['port']
+        if spec.is_a?(Hash)
+          # Connection string spec tests
+          @spec = spec
+          @host = @spec['host']
+          @port = @spec['port']
+        else
+          # DNS seed list spec tests
+          address = Mongo::Address.new(spec)
+          @host = address.host
+          @port = address.port
+        end
       end
 
       def address_family
@@ -276,8 +302,6 @@ module Mongo
             case k
             when 'authmechanism'
               Mongo::URI::AUTH_MECH_MAP[v].downcase.to_s
-            when 'authsource'
-              v == '$external' ? 'external' : v.downcase
             when 'authmechanismproperties'
               v.reduce({}) do |new_v, prop|
                 prop_key = prop.first.downcase
@@ -315,8 +339,12 @@ module Mongo
               opts[MAPPINGS[k]]
             end
 
-          actual = actual.to_s if actual.is_a?(Symbol)
-          actual.downcase! if actual.is_a?(String)
+          if actual.is_a?(Symbol)
+            actual = actual.to_s
+          end
+          if actual.is_a?(String)
+            actual = actual.downcase
+          end
 
           expected == actual
         end

data/spec/support/constraints.rb

@@ -148,6 +148,14 @@ module Constraints
     end
   end
 
+  def require_no_x509_auth
+    before(:all) do
+      if SpecConfig.instance.x509_auth?
+        skip "X.509 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

data/spec/support/crud/spec.rb

@@ -5,14 +5,11 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
+      # @param [ String ] test_path The path to the file.
       #
       # @since 2.0.0
-      def initialize(file)
-        contents = ERB.new(File.read(file)).result
+      def initialize(test_path)
+        contents = File.read(test_path)
 
         # Since Ruby driver binds a client to a database, change the
         # database name in the spec to the one we are using
@@ -21,8 +18,8 @@ module Mongo
         contents.sub!(/"transaction-tests"/, '"ruby-driver"')
         contents.sub!(/"withTransaction-tests"/, '"ruby-driver"')
 
-        @spec = YAML.load(ERB.new(contents).result)
-        @description = File.basename(file)
+        @spec = YAML.load(contents)
+        @description = File.basename(test_path)
         @data = @spec['data']
         @tests = @spec['tests']
 

data/spec/support/event_subscriber.rb

@@ -44,6 +44,13 @@ class EventSubscriber
       end
     end
 
+    # Filters command started events for the specified command name.
+    def command_started_events(command_name)
+      started_events.select do |event|
+        event.command[command_name]
+      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)

data/spec/support/gridfs.rb

@@ -93,15 +93,12 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
+      # @param [ String ] test_path The path to the file.
       #
       # @since 2.1.0
-      def initialize(file)
-        @spec = YAML.load(ERB.new(File.new(file).read).result)
-        @description = File.basename(file)
+      def initialize(test_path)
+        @spec = YAML.load(File.read(test_path))
+        @description = File.basename(test_path)
         @data = @spec['data']
       end
 

data/spec/support/server_discovery_and_monitoring.rb

@@ -76,16 +76,11 @@ module Mongo
 
       # Instantiate the new spec.
       #
-      # @example Create the spec.
-      #   Spec.new(file)
-      #
-      # @param [ String ] file The name of the file.
+      # @param [ String ] test_path The path to the file.
       #
       # @since 2.0.0
-      def initialize(file)
-        file = File.new(file)
-        @test = YAML.load(ERB.new(file.read).result)
-        file.close
+      def initialize(test_path)
+        @test = YAML.load(File.read(test_path))
         @description = @test['description']
         @uri_string = @test['uri']
         @uri = URI.new(uri_string)

data/spec/support/server_selection.rb

@@ -57,17 +57,12 @@ module Mongo
 
         # Instantiate the new spec.
         #
-        # @example Create the spec.
-        #   Spec.new(file)
-        #
-        # @param [ String ] file The name of the file.
+        # @param [ String ] test_path The path to the file.
         #
         # @since 2.0.0
-        def initialize(file)
-          file = File.new(file)
-          @test = YAML.load(ERB.new(file.read).result)
-          file.close
-          @description = "#{@test['topology_description']['type']}: #{File.basename(file)}"
+        def initialize(test_path)
+          @test = YAML.load(File.read(test_path))
+          @description = "#{@test['topology_description']['type']}: #{File.basename(test_path)}"
           @heartbeat_frequency = @test['heartbeatFrequencyMS'] / 1000 if @test['heartbeatFrequencyMS']
           @read_preference = @test['read_preference']
           @read_preference['mode'] = READ_PREFERENCES[@read_preference['mode']]

data/spec/support/server_selection_rtt.rb

@@ -21,15 +21,12 @@ module Mongo
 
         # Instantiate the new spec.
         #
-        # @example Create the spec.
-        #   Spec.new(file)
-        #
-        # @param [ String ] file The name of the file.
+        # @param [ String ] test_path The path to the file.
         #
         # @since 2.0.0
-        def initialize(file)
-          @test = YAML.load(ERB.new(File.new(file).read).result)
-          @description = "#{File.basename(file)}: avg_rtt_ms: #{@test['avg_rtt_ms']}, new_rtt_ms: #{@test['new_rtt_ms']}," +
+        def initialize(test_path)
+          @test = YAML.load(File.read(test_path))
+          @description = "#{File.basename(test_path)}: avg_rtt_ms: #{@test['avg_rtt_ms']}, new_rtt_ms: #{@test['new_rtt_ms']}," +
                            " new_avg_rtt: #{@test['new_avg_rtt']}"
           @average_rtt = @test['avg_rtt_ms'] == 'NULL' ? nil : @test['avg_rtt_ms'].to_f / 1000
           @new_rtt = @test['new_rtt_ms'].to_f / 1000

data/spec/support/spec_config.rb

@@ -75,20 +75,23 @@ class SpecConfig
       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: :replica_set, replica_set: client.cluster.topology.replica_set_name }
-      when /Sharded/
-        { connect: :sharded }
-      when /Single/
-        { 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}"
+
+      begin
+        case client.cluster.topology.class.name
+        when /Replica/
+          { connect: :replica_set, replica_set: client.cluster.topology.replica_set_name }
+        when /Sharded/
+          { connect: :sharded }
+        when /Single/
+          { 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
+      ensure
+        client.close
       end
-      client.close
-      options
     end
   end
 
@@ -255,6 +258,10 @@ EOT
     end
   end
 
+  def client_x509_pem_path
+    "#{ssl_certs_dir}/client-x509.pem"
+  end
+
   def second_level_cert_path
     "#{ssl_certs_dir}/client-second-level.crt"
   end
@@ -307,11 +314,18 @@ EOT
   # Option hashes
 
   def auth_options
-    {
-      user: user,
-      password: password,
-      auth_source: auth_source,
-    }
+    if x509_auth?
+      {
+        auth_mech: @uri_options[:auth_mech],
+        auth_source: '$external',
+      }
+    else
+      {
+        user: user,
+        password: password,
+        auth_source: auth_source,
+      }
+    end
   end
 
   def ssl_options
@@ -322,7 +336,7 @@ EOT
         ssl_cert:  client_cert_path,
         ssl_key:  client_key_path,
         ssl_ca_cert: ca_cert_path,
-      }.merge(@uri_tls_options)
+      }.merge(Utils.underscore_hash(@uri_tls_options))
     else
       {}
     end
@@ -412,4 +426,18 @@ EOT
       ]
     )
   end
+
+  def x509_auth?
+    @uri_options[:auth_mech] == :mongodb_x509
+  end
+
+  # When we use x.509 authentication, omit all of the users we normally create
+  # and authenticate with x.509.
+  def credentials_or_x509(creds)
+    if x509_auth?
+      {auth_mech: :mongodb_x509}
+    else
+      creds
+    end
+  end
 end