mongo 2.5.0 → 2.5.1

data/spec/mongo/uri_spec.rb

@@ -17,7 +17,7 @@ describe Mongo::URI do
       end
     end
 
-    context 'when the scheme is mongodb+srv://' do
+    context 'when the scheme is mongodb+srv://', if: test_connecting_externally? do
 
       let(:string) do
         'mongodb+srv://test5.test.build.10gen.cc'

data/spec/spec_helper.rb

@@ -38,6 +38,7 @@ Encoding.default_external = Encoding::UTF_8
 
 require 'support/travis'
 require 'support/matchers'
+require 'support/event_subscriber'
 require 'support/authorization'
 require 'support/server_discovery_and_monitoring'
 require 'support/server_selection_rtt'
@@ -50,7 +51,7 @@ require 'support/gridfs'
 
 RSpec.configure do |config|
   config.color     = true
-  config.fail_fast = true unless ENV['CI'] || ENV['JENKINS_HOME']
+  config.fail_fast = true unless ENV['CI']
   config.formatter = 'documentation'
   config.include(Authorization)
 
@@ -193,11 +194,18 @@ def list_command_enabled?
   $list_command_enabled ||= $mongo_client.cluster.servers.first.features.list_indexes_enabled?
 end
 
-# Is the test suite running locally (not on Travis or Jenkins).
+# Is the test suite running locally (not on Travis).
 #
 # @since 2.1.0
 def testing_ssl_locally?
-  running_ssl? && !(ENV['CI'] || ENV['JENKINS_CI'])
+  running_ssl? && !(ENV['CI'])
+end
+
+# Should tests relying on external connections be run.
+#
+# @since 2.5.1
+def test_connecting_externally?
+  !ENV['CI'] && !ENV['EXTERNAL_DISABLED']
 end
 
 # Is the test suite running on SSL.
@@ -247,65 +255,5 @@ def initialize_scanned_client!
   Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(database: TEST_DB))
 end
 
-# Test event subscriber.
-#
-# @since 2.5.0
-class EventSubscriber
-
-  # The started events.
-  #
-  # @since 2.5.0
-  attr_reader :started_events
-
-  # The succeeded events.
-  #
-  # @since 2.5.0
-  attr_reader :succeeded_events
-
-  # The failed events.
-  #
-  # @since 2.5.0
-  attr_reader :failed_events
-
-  # Create the test event subscriber.
-  #
-  # @example Create the subscriber
-  #   EventSubscriber.new
-  #
-  # @since 2.5.0
-  def initialize
-    @started_events = []
-    @succeeded_events = []
-    @failed_events = []
-  end
-
-  # Cache the succeeded event.
-  #
-  # @param [ Event ] event The event.
-  #
-  # @since 2.5.0
-  def succeeded(event)
-    @succeeded_events.push(event)
-  end
-
-  # Cache the started event.
-  #
-  # @param [ Event ] event The event.
-  #
-  # @since 2.5.0
-  def started(event)
-    @started_events.push(event)
-  end
-
-  # Cache the failed event.
-  #
-  # @param [ Event ] event The event.
-  #
-  # @since 2.5.0
-  def failed(event)
-    @failed_events.push(event)
-  end
-end
-
 # require all shared examples
 Dir['./spec/support/shared/*.rb'].sort.each { |file| require file }

data/spec/support/authorization.rb

@@ -36,7 +36,7 @@ if ENV['MONGODB_URI']
     ADDRESSES = MONGODB_URI.servers
     CONNECT = { connect: :direct }
   end
-else # For Jenkins
+else
   ADDRESSES = ENV['MONGODB_ADDRESSES'] ? ENV['MONGODB_ADDRESSES'].split(',').freeze : [ '127.0.0.1:27017' ].freeze
   if ENV['RS_ENABLED']
     CONNECT = { connect: :replica_set, replica_set: ENV['RS_NAME'] }
@@ -166,6 +166,11 @@ AUTHORIZED_CLIENT = Mongo::Client.new(
     password: TEST_USER.password)
 )
 
+# Provides an authorized mongo client that retries writes.
+#
+# @since 2.5.1
+AUTHROIZED_CLIENT_WITH_RETRY_WRITES = AUTHORIZED_CLIENT.with(retry_writes: true)
+
 # Provides an unauthorized mongo client on the default test database.
 #
 # @since 2.0.0
@@ -195,6 +200,19 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   monitoring: false
 )
 
+# A client that has an event subscriber for commands.
+#
+# @since 2.5.1
+SUBSCRIBED_CLIENT = Mongo::Client.new(
+    ADDRESSES,
+    TEST_OPTIONS.merge(
+        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)
+
 module Authorization
 
   # On inclusion provides helpers for use with testing with and without
@@ -220,6 +238,22 @@ module Authorization
     # @since 2.0.0
     context.let(:authorized_client) { AUTHORIZED_CLIENT }
 
+    # Provides an authorized mongo client on the default test database that retries writes.
+    #
+    # @since 2.5.1
+    context.let(:authorized_client_with_retry_writes) do
+      EventSubscriber.clear_events!
+      AUTHROIZED_CLIENT_WITH_RETRY_WRITES
+    end
+
+    # Provides an authorized mongo client that has a Command subscriber.
+    #
+    # @since 2.5.1
+    context.let(:subscribed_client) do
+      EventSubscriber.clear_events!
+      SUBSCRIBED_CLIENT
+    end
+
     # Provides an unauthorized mongo client on the default test database.
     #
     # @since 2.0.0

data/spec/support/connection_string_tests/invalid-uris.yml

@@ -167,14 +167,6 @@ tests:
         hosts: ~
         auth: ~
         options: ~
-    -
-        description: "Username with password containing an unescaped colon"
-        uri: "mongodb://alice:foo:bar@127.0.0.1"
-        valid: false
-        warning: ~
-        hosts: ~
-        auth: ~
-        options: ~
     -
         description: "Username containing an unescaped at-sign"
         uri: "mongodb://alice@@127.0.0.1"
@@ -193,7 +185,7 @@ tests:
         options: ~
     -
         description: "Username containing an unescaped slash"
-        uri: "mongodb://alice/@127.0.0.1/db"
+        uri: "mongodb://alice/@localhost/db"
         valid: false
         warning: ~
         hosts: ~
@@ -201,7 +193,7 @@ tests:
         options: ~
     -
         description: "Username containing unescaped slash with password"
-        uri: "mongodb://alice/bob:foo@127.0.0.1/db"
+        uri: "mongodb://alice/bob:foo@localhost/db"
         valid: false
         warning: ~
         hosts: ~
@@ -209,7 +201,7 @@ tests:
         options: ~
     -
         description: "Username with password containing an unescaped slash"
-        uri: "mongodb://alice:foo/bar@127.0.0.1/db"
+        uri: "mongodb://alice:foo/bar@localhost/db"
         valid: false
         warning: ~
         hosts: ~
@@ -223,3 +215,27 @@ tests:
         hosts: ~
         auth: ~
         options: ~
+    -
+        description: "mongodb+srv with multiple service names"
+        uri: "mongodb+srv://test5.test.mongodb.com,test6.test.mongodb.com"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "mongodb+srv with port number"
+        uri: "mongodb+srv://test7.test.mongodb.com:27018"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~
+    -
+        description: "Username with password containing an unescaped percent sign"
+        uri: "mongodb://alice%foo:bar@127.0.0.1"
+        valid: false
+        warning: ~
+        hosts: ~
+        auth: ~
+        options: ~

data/spec/support/event_subscriber.rb

@@ -0,0 +1,66 @@
+# Test event subscriber.
+#
+# @since 2.5.0
+class EventSubscriber
+
+  class << self
+
+    # The started events.
+    #
+    # @since 2.5.0
+    def started_events
+      @started_events ||= []
+    end
+
+    # The succeeded events.
+    #
+    # @since 2.5.0
+    def succeeded_events
+      @succeeded_events ||= []
+    end
+
+    # The failed events.
+    #
+    # @since 2.5.0
+    def failed_events
+      @failed_events ||= []
+    end
+
+    # Cache the succeeded event.
+    #
+    # @param [ Event ] event The event.
+    #
+    # @since 2.5.0
+    def succeeded(event)
+      succeeded_events.push(event)
+    end
+
+    # Cache the started event.
+    #
+    # @param [ Event ] event The event.
+    #
+    # @since 2.5.0
+    def started(event)
+      started_events.push(event)
+    end
+
+    # Cache the failed event.
+    #
+    # @param [ Event ] event The event.
+    #
+    # @since 2.5.0
+    def failed(event)
+      failed_events.push(event)
+    end
+
+    # Clear all cached events.
+    #
+    # @since 2.5.1
+    def clear_events!
+      @started_events = []
+      @succeeded_events = []
+      @failed_events = []
+      self
+    end
+  end
+end

data/spec/support/sdam/rs/compatible.yml

@@ -0,0 +1,41 @@
+description: "Replica set member with large maxWireVersion"
+uri: "mongodb://a,b/?replicaSet=rs"
+phases: [
+    {
+        responses: [
+                ["a:27017", {
+                    ok: 1,
+                    ismaster: true,
+                    setName: "rs",
+                    hosts: ["a:27017", "b:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
+                }],
+                ["b:27017", {
+                    ok: 1,
+                    ismaster: false,
+                    secondary: true,
+                    setName: "rs",
+                    hosts: ["a:27017", "b:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 1000
+                }]
+        ],
+        outcome: {
+            servers: {
+                "a:27017": {
+                    type: "RSPrimary",
+                    setName: "rs"
+                },
+                "b:27017": {
+                    type: "RSSecondary",
+                    setName: "rs"
+                }
+            },
+            topologyType: "ReplicaSetWithPrimary",
+            setName: "rs",
+            logicalSessionTimeoutMinutes: null,
+            compatible: true
+        }
+    }
+]

data/spec/support/sdam/rs/discover_arbiters.yml

@@ -13,7 +13,9 @@ phases: [
                     ismaster: true,
                     hosts: ["a:27017"],
                     arbiters: ["b:27017"],
-                    setName: "rs"
+                    setName: "rs",
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 

data/spec/support/sdam/rs/discover_passives.yml

@@ -13,7 +13,9 @@ phases: [
                     ismaster: true,
                     hosts: ["a:27017"],
                     passives: ["b:27017"],
-                    setName: "rs"
+                    setName: "rs",
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 
@@ -49,7 +51,9 @@ phases: [
                     passive: true,
                     hosts: ["a:27017"],
                     passives: ["b:27017"],
-                    setName: "rs"
+                    setName: "rs",
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 

data/spec/support/sdam/rs/discover_primary.yml

@@ -12,7 +12,9 @@ phases: [
                     ok: 1,
                     ismaster: true,
                     setName: "rs",
-                    hosts: ["a:27017", "b:27017"]
+                    hosts: ["a:27017", "b:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 

data/spec/support/sdam/rs/discover_secondary.yml

@@ -13,7 +13,9 @@ phases: [
                     ismaster: false,
                     secondary: true,
                     setName: "rs",
-                    hosts: ["a:27017", "b:27017"]
+                    hosts: ["a:27017", "b:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 

data/spec/support/sdam/rs/discovery.yml

@@ -14,7 +14,9 @@ phases: [
                     ismaster: false,
                     secondary: true,
                     setName: "rs",
-                    hosts: ["a:27017", "b:27017", "c:27017"]
+                    hosts: ["a:27017", "b:27017", "c:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 
@@ -57,7 +59,9 @@ phases: [
                     secondary: true,
                     setName: "rs",
                     primary: "d:27017",
-                    hosts: ["b:27017", "c:27017", "d:27017"]
+                    hosts: ["b:27017", "c:27017", "d:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 
@@ -104,7 +108,9 @@ phases: [
                     ok: 1,
                     ismaster: true,
                     setName: "rs",
-                    hosts: ["b:27017", "c:27017", "d:27017", "e:27017"]
+                    hosts: ["b:27017", "c:27017", "d:27017", "e:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],
 
@@ -153,7 +159,9 @@ phases: [
                     ismaster: false,
                     secondary: true,
                     setName: "rs",
-                    hosts: ["a:27017", "b:27017", "c:27017"]
+                    hosts: ["a:27017", "b:27017", "c:27017"],
+                    minWireVersion: 0,
+                    maxWireVersion: 6
                 }]
         ],