mongo 2.0.6 → 2.1.0

data/spec/spec_helper.rb

@@ -17,8 +17,28 @@ if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.2'
   end
 end
 
+TEST_SET = 'ruby-driver-rs'
+COVERAGE_MIN = 90
+CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
+SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/support/sdam/**/*.yml")
+SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/rtt/*.yml")
+SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
+CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/support/crud_tests/**/*.yml")
+COMMAND_MONITORING_TESTS = Dir.glob("#{CURRENT_PATH}/support/command_monitoring/**/*.yml")
+CONNECTION_STRING_TESTS = Dir.glob("#{CURRENT_PATH}/support/connection_string_tests/*.yml")
+GRIDFS_TESTS = Dir.glob("#{CURRENT_PATH}/support/gridfs_tests/*.yml")
+
+SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
+CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
+CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
+CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
+CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
+
 require 'mongo'
 
+Mongo::Logger.logger = Logger.new($stdout)
+Mongo::Logger.logger.level = Logger::INFO
+
 require 'support/travis'
 require 'support/matchers'
 require 'support/authorization'
@@ -26,9 +46,9 @@ require 'support/server_discovery_and_monitoring'
 require 'support/server_selection_rtt'
 require 'support/server_selection'
 require 'support/crud'
-
-Mongo::Logger.logger = Logger.new($stdout)
-Mongo::Logger.logger.level = Logger::INFO
+require 'support/command_monitoring'
+require 'support/connection_string'
+require 'support/gridfs'
 
 RSpec.configure do |config|
   config.color     = true
@@ -43,6 +63,7 @@ RSpec.configure do |config|
       # database. This user will need to be authenticated in order to add any
       # more users to any other databases.
       ADMIN_UNAUTHORIZED_CLIENT.database.users.create(ROOT_USER)
+      ADMIN_UNAUTHORIZED_CLIENT.close
     rescue Exception => e
     end
     begin
@@ -53,7 +74,7 @@ RSpec.configure do |config|
       unless write_command_enabled?
         # If we are on versions less than 2.6, we need to create a user for
         # each database, since the users are not stored in the admin database
-        # but in the system.users collection on the datbases themselves. Also,
+        # but in the system.users collection on the databases themselves. Also,
         # roles in versions lower than 2.6 can only be strings, not hashes.
         begin ADMIN_AUTHORIZED_TEST_CLIENT.database.users.create(TEST_READ_WRITE_USER); rescue; end
       end
@@ -61,20 +82,6 @@ RSpec.configure do |config|
   end
 end
 
-TEST_SET = 'ruby-driver-rs'
-COVERAGE_MIN = 90
-CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
-SERVER_DISCOVERY_TESTS = Dir.glob("#{CURRENT_PATH}/support/sdam/**/*.yml")
-SERVER_SELECTION_RTT_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/rtt/*.yml")
-SERVER_SELECTION_TESTS = Dir.glob("#{CURRENT_PATH}/support/server_selection/selection/**/*.yml")
-CRUD_TESTS = Dir.glob("#{CURRENT_PATH}/support/crud_tests/**/*.yml")
-
-SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
-CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
-CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
-CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
-CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
-
 # Determine whether the test clients are connecting to a standalone.
 #
 # @since 2.0.0
@@ -91,12 +98,13 @@ def replica_set?
   $replica_set ||= $mongo_client.cluster.replica_set?
 end
 
-# Determine whether the test clients are connecting to a sharded cluster.
+# Determine whether the test clients are connecting to a sharded cluster
+# or a single mongos.
 #
 # @since 2.0.0
 def sharded?
   $mongo_client ||= initialize_scanned_client!
-  $sharded ||= $mongo_client.cluster.sharded?
+  $sharded ||= ($mongo_client.cluster.sharded? || single_mongos?)
 end
 
 # Determine whether the single address provided is a replica set member.
@@ -107,7 +115,8 @@ end
 # @since 2.0.0
 def single_rs_member?
   $mongo_client ||= initialize_scanned_client!
-  single_seed? && $mongo_client.cluster.servers.first.replica_set_name
+  $single_rs_member ||= (single_seed? &&
+      $mongo_client.cluster.servers.first.replica_set_name)
 end
 
 # Determine whether the single address provided is a mongos.
@@ -118,7 +127,8 @@ end
 # @since 2.0.0
 def single_mongos?
   $mongo_client ||= initialize_scanned_client!
-  single_seed? && $mongo_client.cluster.servers.first.mongos?
+  $single_mongos ||= (single_seed? &&
+      $mongo_client.cluster.servers.first.mongos?)
 end
 
 # Determine whether a single address was provided.
@@ -146,10 +156,16 @@ def list_command_enabled?
   $list_command_enabled ||= $mongo_client.cluster.servers.first.features.list_indexes_enabled?
 end
 
-def testing_locally?
-  !(ENV['CI'] || ENV['JENKINS_HOME'])
+# Is the test suite running locally (not on Travis or Jenkins).
+#
+# @since 2.1.0
+def testing_ssl_locally?
+  running_ssl? && !(ENV['CI'] || ENV['JENKINS_CI'])
 end
 
+# Is the test suite running on SSL.
+#
+# @since 2.0.2
 def running_ssl?
   SSL
 end

data/spec/support/authorization.rb

@@ -50,13 +50,28 @@ WRITE_CONCERN = CONNECT[:connect] == :replica_set ? { w: ADDRESSES.size } : { w:
 # @since 2.0.3
 SSL = ENV['SSL_ENABLED'] == 'true'
 
+# SSL options.
+#
+# @since 2.1.0
+SSL_OPTIONS = {
+                  ssl: SSL,
+                  ssl_verify: false,
+                  ssl_cert:  CLIENT_PEM,
+                  ssl_key:  CLIENT_PEM
+                }
+
+# Base test options.
+#
+# @since 2.1.0
+BASE_OPTIONS = {
+                  max_pool_size: 1,
+                  write: WRITE_CONCERN
+               }
+
 # Options for test suite clients.
 #
 # @since 2.0.3
-TEST_OPTIONS = CONNECT.merge(max_pool_size: 1,
-                             write: WRITE_CONCERN,
-                             ssl: SSL,
-                             server_selection_timeout: 3)
+TEST_OPTIONS = BASE_OPTIONS.merge(CONNECT).merge(SSL_OPTIONS)
 
 # The root user name.
 #
@@ -129,8 +144,7 @@ AUTHORIZED_CLIENT = Mongo::Client.new(
 # @since 2.0.0
 UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  TEST_OPTIONS.merge(
-    database: TEST_DB)
+  TEST_OPTIONS.merge(database: TEST_DB, monitoring: false)
 )
 
 # Provides an unauthorized mongo client on the admin database, for use in
@@ -139,8 +153,7 @@ UNAUTHORIZED_CLIENT = Mongo::Client.new(
 # @since 2.0.0
 ADMIN_UNAUTHORIZED_CLIENT = Mongo::Client.new(
   ADDRESSES,
-  TEST_OPTIONS.merge(
-    database: Mongo::Database::ADMIN)
+  TEST_OPTIONS.merge(database: Mongo::Database::ADMIN, monitoring: false)
 )
 
 # Get an authorized client on the test database logged in as the admin
@@ -151,7 +164,8 @@ ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
   user: ROOT_USER.name,
   password: ROOT_USER.password,
   database: TEST_DB,
-  auth_source: Mongo::Database::ADMIN
+  auth_source: Mongo::Database::ADMIN,
+  monitoring: false
 )
 
 module Authorization

data/spec/support/certificates/client.pem

@@ -32,13 +32,13 @@ Certificate:
                     6e:a7
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
-            X509v3 Basic Constraints: 
+            X509v3 Basic Constraints:
                 CA:FALSE
-            Netscape Comment: 
+            Netscape Comment:
                 OpenSSL Generated Certificate
-            X509v3 Subject Key Identifier: 
+            X509v3 Subject Key Identifier:
                 4A:8B:EE:22:42:E6:F8:62:4C:86:38:8D:C5:78:95:98:C1:10:05:7C
-            X509v3 Authority Key Identifier: 
+            X509v3 Authority Key Identifier:
                 keyid:07:41:19:3A:9F:7E:C5:B7:22:4E:B7:BC:D5:DF:E4:FC:09:B8:64:16
 
     Signature Algorithm: sha1WithRSAEncryption

data/spec/support/command_monitoring/bulkWrite.yml

@@ -0,0 +1,73 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful mixed bulk write"
+    operation:
+      name: "bulkWrite"
+      arguments:
+        requests:
+          - insertOne: 
+              document: { _id: 4, x: 44 }
+          - updateOne:
+              filter: { _id: 3 }
+              update: { $set: { x: 333 } }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 4, x: 44 }
+            ordered: true
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "insert"
+      -
+        command_started_event:
+          command:
+            update: *collection_name
+            updates:
+              - { q: {_id: 3 }, u: { $set: { x: 333 } }, upsert: false, multi: false }
+            ordered: true
+          command_name: "update"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "update"
+  -
+    description: "A successful unordered bulk write with an unacknowledged write concern"
+    comment: "On a 2.4 server, no GLE is sent and requires a client-side manufactored reply"
+    operation:
+      name: "bulkWrite"
+      arguments:
+        requests:
+          - insertOne: 
+              document: { _id: 4, x: 44 }
+        ordered: false
+        writeConcern: { w: 0 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            insert: *collection_name
+            documents:
+              - { _id: 4, x: 44 }
+            ordered: false
+            writeConcern: { w: 0 }
+          command_name: "insert"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0 }
+          command_name: "insert"

data/spec/support/command_monitoring/command.yml

@@ -0,0 +1,42 @@
+data:
+  - { _id: 1, x: 11 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful command"
+    operation:
+      name: "count"
+      arguments:
+        filter: { _id: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            count: *collection_name
+            query: { _id: 1 }
+          command_name: "count"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "count"
+  -
+    description: "A failed command event"
+    operation:
+      name: "count"
+      arguments:
+        filter: { $or: true }
+    expectations:
+      -
+        command_started_event:
+          command:
+            count: *collection_name
+            query: { $or: true }
+          command_name: "count"
+          database_name: *database_name
+      -
+        command_failed_event:
+          command_name: "count"

data/spec/support/command_monitoring/deleteMany.yml

@@ -0,0 +1,55 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful delete many"
+    operation:
+      name: "deleteMany"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $gt: 1 }}, limit: 0 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 2 }
+          command_name: "delete"
+  -
+    description: "A successful delete many command with write errors"
+    operation:
+      name: "deleteMany"
+      arguments:
+        filter:
+          _id: { $nothing: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $nothing: 1 }}, limit: 0 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "delete"

data/spec/support/command_monitoring/deleteOne.yml

@@ -0,0 +1,55 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+
+tests:
+  -
+    description: "A successful delete one"
+    operation:
+      name: "deleteOne"
+      arguments:
+        filter:
+          _id: { $gt: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $gt: 1 }}, limit: 1 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply: { ok: 1.0, n: 1 }
+          command_name: "delete"
+  -
+    description: "A successful delete one command with write errors"
+    operation:
+      name: "deleteOne"
+      arguments:
+        filter:
+          _id: { $nothing: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            delete: *collection_name
+            deletes:
+              - { q: { _id: { $nothing: 1 }}, limit: 1 }
+            ordered: true
+          command_name: "delete"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            n: 0
+            writeErrors:
+              - { index: 0, code: 42, errmsg: "" }
+          command_name: "delete"

data/spec/support/command_monitoring/find.yml

@@ -0,0 +1,219 @@
+data:
+  - { _id: 1, x: 11 }
+  - { _id: 2, x: 22 }
+  - { _id: 3, x: 33 }
+  - { _id: 4, x: 44 }
+  - { _id: 5, x: 55 }
+
+collection_name: &collection_name "test"
+database_name: &database_name "ruby-driver"
+namespace: &namespace "ruby-driver.test"
+
+tests:
+  -
+    description: "A successful find event with no options"
+    operation:
+      name: "find"
+      arguments:
+        filter: { _id: 1 }
+    expectations:
+      -
+        command_started_event:
+          command:
+            find: *collection_name
+            filter: { _id: 1 }
+          command_name: "find"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "0" }
+              ns: *namespace
+              firstBatch:
+                - { _id: 1, x: 11 }
+          command_name: "find"
+  -
+    description: "A successful find event with options"
+    operation:
+      name: "find"
+      arguments:
+        filter: { _id: { $gt: 1 } }
+        sort: { _id: 1 }
+        limit: 2
+        skip: 2
+        modifiers:
+          $comment: "test"
+          $hint: { _id: 1 }
+          $max: { _id: 6 }
+          $maxScan: 5000
+          $maxTimeMS: 6000
+          $min: { _id: 0 }
+          $readPreference: { mode: "secondaryPreferred" }
+          $returnKey: false
+          $showDiskLoc: false
+          $snapshot: false
+    expectations:
+      -
+        command_started_event:
+          command:
+            find: *collection_name
+            filter: { _id:  { $gt: 1 } }
+            sort: { _id: 1 }
+            limit: 2
+            skip: 2
+            comment: "test"
+            hint: { _id: 1 }
+            max: { _id: 6 }
+            maxScan: 5000
+            maxTimeMS: 6000
+            min: { _id: 0 }
+            readPreference: { mode: "secondaryPreferred" }
+            returnKey: false
+            showRecordId: false
+            snapshot: false
+          command_name: "find"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "0" }
+              ns: *namespace
+              firstBatch:
+                - { _id: 4, x: 44 }
+                - { _id: 5, x: 55 }
+          command_name: "find"
+  -
+    description: "A successful find event with a getmore"
+    operation:
+      name: "find"
+      arguments:
+        filter: { _id: { $gte: 1 }}
+        sort: { _id: 1 }
+        batchSize: 3
+    expectations:
+      -
+        command_started_event:
+          command:
+            find: *collection_name
+            filter: { _id: { $gte : 1 }}
+            sort: { _id: 1 }
+            batchSize: 3
+          command_name: "find"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "42" }
+              ns: *namespace
+              firstBatch:
+                - { _id: 1, x: 11 }
+                - { _id: 2, x: 22 }
+                - { _id: 3, x: 33 }
+          command_name: "find"
+      -
+        command_started_event:
+          command:
+            getMore: { $numberLong: "42" }
+            collection: *collection_name
+            batchSize: 3
+          command_name: "getMore"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "0" }
+              ns: *namespace
+              nextBatch:
+                - { _id: 4, x: 44 }
+                - { _id: 5, x: 55 }
+          command_name: "getMore"
+  -
+    description: "A successful find event with a getmore and killcursors"
+    operation:
+      name: "find"
+      arguments:
+        filter: { _id: { $gte: 1 }}
+        sort: { _id: 1 }
+        batchSize: 3
+        limit: 4
+    expectations:
+      -
+        command_started_event:
+          command:
+            find: *collection_name
+            filter: { _id: { $gte : 1 }}
+            sort: { _id: 1 }
+            batchSize: 3
+            limit: 4
+          command_name: "find"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "42" }
+              ns: *namespace
+              firstBatch:
+                - { _id: 1, x: 11 }
+                - { _id: 2, x: 22 }
+                - { _id: 3, x: 33 }
+          command_name: "find"
+      -
+        command_started_event:
+          command:
+            getMore: { $numberLong: "42" }
+            collection: *collection_name
+            batchSize: 1
+          command_name: "getMore"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursor:
+              id: { $numberLong: "42" }
+              ns: *namespace
+              nextBatch:
+                - { _id: 4, x: 44 }
+          command_name: "getMore"
+      -
+        command_started_event:
+          command:
+            killCursors: *collection_name
+            cursors:
+              - { $numberLong: "42" }
+          command_name: "killCursors"
+          database_name: *database_name
+      -
+        command_succeeded_event:
+          reply:
+            ok: 1.0
+            cursorsUnknown:
+              - { $numberLong: "42" }
+          command_name: "killCursors"
+  -
+    description: "A failed find event"
+    operation:
+      name: "find"
+      arguments:
+        filter: { $or: true }
+    expectations:
+      -
+        command_started_event:
+          command:
+            find: *collection_name
+            filter: { $or: true }
+          command_name: "find"
+          database_name: *database_name
+      -
+        command_failed_event:
+          command_name: "find"