mongo 2.6.4 → 2.7.0.rc0

data/spec/spec_tests/transactions_spec.rb

@@ -7,10 +7,14 @@ describe 'Transactions' do
     spec = Mongo::Transactions::Spec.new(file)
 
     context(spec.description) do
-      spec.tests.each do |test|
-        context(test.description) do
+      spec.tests.each do |test_factory|
+        test_instance = test_factory.call
+
+        context(test_instance.description) do
           require_transaction_support
 
+          let(:test) { test_factory.call }
+
           before(:each) do
             test.setup_test
           end
@@ -23,24 +27,27 @@ describe 'Transactions' do
             test.run
           end
 
+          let(:verifier) { Mongo::Transactions::Verifier.new(test) }
+
           it 'returns the correct result' do
-            expect(results[:results]).to match_operation_result(test)
+            verifier.verify_operation_result(results[:results])
           end
 
-          it 'has the correct data in the collection', if: test.outcome_collection_data do
-            expect(results[:contents]).to match_collection_data(test)
+          it 'has the correct data in the collection', if: test_instance.outcome_collection_data do
+            results
+            verifier.verify_collection_data(results[:contents])
           end
 
-          it 'has the correct command_started events', if: test.expectations do
-            test.expectations.each do |expectation|
-              # We convert the hashes to sorted arrays to ensure that asserting equality between
-              # the expected and actual event descriptions don't fail due to the same entries being
-              # in a different order.
-              expectation['command_started_event']['command'] = expectation['command_started_event']['command'].to_a.sort
-              expectation['command_started_event']['command'].delete_if { |_, v| v == nil }
+          if test_instance.expectations
+            it 'has the correct number of command_started events' do
+              verifier.verify_command_started_event_count(results)
             end
 
-            expect(results[:events]).to eq(test.expectations)
+            test_instance.expectations.each_with_index do |expectation, i|
+              it "has the correct command_started event #{i}" do
+                verifier.verify_command_started_event(results, i)
+              end
+            end
           end
         end
       end

data/spec/spec_tests/uri_options_spec.rb

@@ -0,0 +1,94 @@
+require 'lite_spec_helper'
+
+describe 'Uri Options' do
+  include Mongo::ConnectionString
+
+  URI_OPTIONS_TESTS.each do |file|
+
+    spec = Mongo::ConnectionString::Spec.new(file)
+
+    context(spec.description) do
+
+      before(:all) do
+
+        module Mongo
+          class Address
+
+            private
+
+            alias :original_create_resolver :create_resolver
+            def create_resolver(timeout, ssl_options)
+              family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+              info = ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM)
+              FAMILY_MAP[info.first[4]].new(info[3], port, host)
+            end
+          end
+        end
+      end
+
+      after(:all) do
+
+        module Mongo
+          # Return the implementations to their originals for the other
+          # tests in the suite.
+          class Address
+            alias :create_resolver :original_create_resolver
+            remove_method(:original_create_resolver)
+          end
+        end
+      end
+
+      spec.tests.each do |test|
+
+        context "#{test.description}" do
+
+          context 'when the uri should warn', if: test.warn? do
+
+            before do
+              expect(Mongo::Logger.logger).to receive(:warn)
+            end
+
+            it 'warns' do
+              expect(test.client).to be_a(Mongo::Client)
+            end
+          end
+
+          context 'when the uri is invalid', unless: test.valid? do
+
+            it 'raises an error' do
+              expect{
+                test.uri
+              }.to raise_exception(Mongo::Error::InvalidURI)
+            end
+          end
+
+          context 'when the uri should not warn', if: !test.warn? do
+
+            before do
+              expect(Mongo::Logger.logger).not_to receive(:warn)
+            end
+
+            it 'does not raise an exception or warning' do
+              expect(test.client).to be_a(Mongo::Client)
+            end
+          end
+
+          context 'when the uri is valid', if: test.valid? do
+
+            it 'creates a client with the correct hosts' do
+              expect(test.client).to have_hosts(test)
+            end
+
+            it 'creates a client with the correct authentication properties' do
+              expect(test.client).to match_auth(test)
+            end
+
+            it 'creates a client with the correct options' do
+              expect(test.client).to match_options(test)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/authorization.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2018 MongoDB, Inc.
+# Copyright (C) 2009-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,174 +12,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# The default test database for all specs.
-#
-# @since 2.0.0
-TEST_DB = 'ruby-driver'.freeze
-
 # The default test collection.
 #
 # @since 2.0.0
 TEST_COLL = 'test'.freeze
 
-# The write concern to use in the tests.
-#
-# @since 2.0.0
-WRITE_CONCERN = SpecConfig.instance.connect_replica_set? ? { w: 2 } : { w: 1 }
-
 # An invalid write concern.
 #
 # @since 2.4.2
 INVALID_WRITE_CONCERN = { w: 4 }
 
-# What compressor to use, if any.
-#
-# @since 2.5.0
-COMPRESSORS = ENV['COMPRESSORS'] ? { compressors: ENV['COMPRESSORS'].split(',') } : {}
-
-# SSL options.
-#
-# @since 2.1.0
-SSL_OPTIONS = {
-                  ssl: SpecConfig.instance.ssl?,
-                  ssl_verify: false,
-                  ssl_cert:  CLIENT_CERT_PEM,
-                  ssl_key:  CLIENT_KEY_PEM
-                }
-
-# Base test options.
-#
-# @since 2.1.0
-BASE_OPTIONS = {
-                  max_pool_size: 1,
-                  write: WRITE_CONCERN,
-                  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: 2,
-                  wait_queue_timeout: 2,
-                  connect_timeout: 3,
-                  max_idle_time: 5
-               }
-
-# Options for test suite clients.
-#
-# @since 2.0.3
-TEST_OPTIONS = BASE_OPTIONS.merge(SpecConfig.instance.connect).merge(SSL_OPTIONS).merge(COMPRESSORS)
-
-# Gets the root system administrator user.
-#
-# @since 2.0.0
-ROOT_USER = Mongo::Auth::User.new(
-  user: SpecConfig.instance.user || 'root-user',
-  password: SpecConfig.instance.password || 'password',
-  roles: [
-    Mongo::Auth::Roles::USER_ADMIN_ANY_DATABASE,
-    Mongo::Auth::Roles::DATABASE_ADMIN_ANY_DATABASE,
-    Mongo::Auth::Roles::READ_WRITE_ANY_DATABASE,
-    Mongo::Auth::Roles::HOST_MANAGER,
-    Mongo::Auth::Roles::CLUSTER_ADMIN
-  ]
-)
-
-# Get the default test user for the suite on versions 2.6 and higher.
-#
-# @since 2.0.0
-TEST_USER = Mongo::Auth::User.new(
-  database: TEST_DB,
-  user: 'test-user',
-  password: 'password',
-  roles: [
-    { role: Mongo::Auth::Roles::READ_WRITE, db: TEST_DB },
-    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: TEST_DB },
-    { role: Mongo::Auth::Roles::READ_WRITE, db: 'invalid_database' },
-    { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'invalid_database' },
-		{ role: Mongo::Auth::Roles::READ_WRITE, db: 'hr' },           # For transactions examples
-		{ role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'hr' },       # For transactions examples
-		{ role: Mongo::Auth::Roles::READ_WRITE, db: 'reporting' },    # For transactions examples
-		{ role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'reporting' } # For transactions examples
-
-  ]
-)
-
-# MongoDB 2.4 and lower does not allow hashes as roles, so we need to create a
-# user on those versions for each database permission in order to ensure the
-# legacy roles work with users. The following users are those.
-
-# Gets the default test user for the suite on 2.4 and lower.
-#
-# @since 2.0.
-TEST_READ_WRITE_USER = Mongo::Auth::User.new(
-  database: TEST_DB,
-  user: TEST_USER.name,
-  password: TEST_USER.password,
-  roles: [ Mongo::Auth::Roles::READ_WRITE, Mongo::Auth::Roles::DATABASE_ADMIN ]
-)
-
-# Provides an authorized mongo client on the default test database for the
-# default test user.
-#
-# @since 2.0.0
-AUTHORIZED_CLIENT = Mongo::Client.new(
-  SpecConfig.instance.addresses,
-  TEST_OPTIONS.merge(
-    database: TEST_DB,
-    user: TEST_USER.name,
-    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
-UNAUTHORIZED_CLIENT = Mongo::Client.new(
-  SpecConfig.instance.addresses,
-  TEST_OPTIONS.merge(database: TEST_DB, monitoring: false)
-)
-
-# Provides an unauthorized mongo client on the admin database, for use in
-# setting up the first admin root user.
-#
-# @since 2.0.0
-ADMIN_UNAUTHORIZED_CLIENT = Mongo::Client.new(
-  SpecConfig.instance.addresses,
-  TEST_OPTIONS.merge(database: Mongo::Database::ADMIN, monitoring: false)
-)
-
-# Get an authorized client on the test database logged in as the admin
-# root user.
-#
-# @since 2.0.0
-ADMIN_AUTHORIZED_TEST_CLIENT = ADMIN_UNAUTHORIZED_CLIENT.with(
-  user: ROOT_USER.name,
-  password: ROOT_USER.password,
-  database: TEST_DB,
-  auth_source: SpecConfig.instance.auth_source || Mongo::Database::ADMIN,
-  monitoring: false
-)
-
-# A client that has an event subscriber for commands.
-#
-# @since 2.5.1
-SUBSCRIBED_CLIENT = Mongo::Client.new(
-    SpecConfig.instance.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
@@ -192,25 +34,44 @@ module Authorization
     # Gets the root system administrator user.
     #
     # @since 2.0.0
-    context.let(:root_user) { ROOT_USER }
+    context.let(:root_user) { SpecConfig.instance.root_user }
 
     # Get the default test user for the suite.
     #
     # @since 2.0.0
-    context.let(:test_user) { TEST_USER }
+    context.let(:test_user) { SpecConfig.instance.test_user }
 
     # Provides an authorized mongo client on the default test database for the
     # default test user.
     #
     # @since 2.0.0
-    context.let(:authorized_client) { AUTHORIZED_CLIENT }
+    context.let(:authorized_client) { ClientRegistry.instance.global_client('authorized') }
+
+    # A client with a different cluster, for testing session use across
+    # clients
+    context.let(:another_authorized_client) do
+      new_local_client(
+        SpecConfig.instance.addresses,
+        SpecConfig.instance.test_options.merge(
+          database: SpecConfig.instance.test_db,
+          user: SpecConfig.instance.test_user.name,
+          password: SpecConfig.instance.test_user.password,
+          heartbeat_frequency: 10,
+        ),
+      )
+    end
 
     # 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
+      ClientRegistry.instance.global_client('authorized_with_retry_writes')
+    end
+
+    context.let(:authorized_client_without_retry_writes) do
+      EventSubscriber.clear_events!
+      ClientRegistry.instance.global_client('authorized_without_retry_writes')
     end
 
     # Provides an authorized mongo client that has a Command subscriber.
@@ -218,25 +79,25 @@ module Authorization
     # @since 2.5.1
     context.let(:subscribed_client) do
       EventSubscriber.clear_events!
-      SUBSCRIBED_CLIENT
+      ClientRegistry.instance.global_client('subscribed')
     end
 
     # Provides an unauthorized mongo client on the default test database.
     #
     # @since 2.0.0
-    context.let!(:unauthorized_client) { UNAUTHORIZED_CLIENT }
+    context.let(:unauthorized_client) { ClientRegistry.instance.global_client('unauthorized') }
 
     # Provides an unauthorized mongo client on the admin database, for use in
     # setting up the first admin root user.
     #
     # @since 2.0.0
-    context.let!(:admin_unauthorized_client) { ADMIN_UNAUTHORIZED_CLIENT }
+    context.let(:admin_unauthorized_client) { ClientRegistry.instance.global_client('admin_unauthorized') }
 
     # Get an authorized client on the test database logged in as the admin
     # root user.
     #
     # @since 2.0.0
-    context.let!(:root_authorized_client) { ADMIN_AUTHORIZED_TEST_CLIENT }
+    context.let(:root_authorized_client) { ClientRegistry.instance.global_client('root_authorized') }
 
     # Gets the default test collection from the authorized client.
     #

data/spec/support/change_streams.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 MongoDB, Inc.
+# Copyright (C) 2014-2019 MongoDB, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ module Mongo
         end
 
         def setup_test
-          @global_client = ADMIN_AUTHORIZED_TEST_CLIENT.use('admin')
+          @global_client = ClientRegistry.instance.global_client('root_authorized').use('admin')
 
           @db1 = @global_client.use(@db1_name).database.tap(&:drop)
           @db2 = @global_client.use(@db2_name).database.tap(&:drop)
@@ -107,7 +107,7 @@ module Mongo
           @db1[@coll1_name].create
           @db2[@coll2_name].create
 
-          client = ADMIN_AUTHORIZED_TEST_CLIENT.with(
+          client = ClientRegistry.instance.global_client('root_authorized').with(
             database: @db1_name,
             app_name: 'this is used solely to force the new client to create its own cluster')
           client.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber.clear_events!)
@@ -156,9 +156,9 @@ module Mongo
         end
 
         def teardown_test
-          @global_client.close
-          @db1.drop
-          @db2.drop
+          @global_client && @global_client.close
+          @db1 && @db1.drop
+          @db2 && @db2.drop
         end
 
         def match_result?(result)
@@ -180,7 +180,7 @@ module Mongo
 
         def events
           EventSubscriber.started_events.reduce([]) do |evs, e|
-            next evs if [:saslStart, :saslContinue, :killCursors].include?(e.command_name)
+            next evs if %w(saslStart saslContinue killCursors).include?(e.command_name)
 
             evs << {
               'command_started_event' => {