mongo 2.14.0.rc1 → 2.14.0

data/spec/integration/sdam_error_handling_spec.rb

@@ -19,6 +19,7 @@ describe 'SDAM error handling' do
     new_local_client(SpecConfig.instance.addresses,
       SpecConfig.instance.all_test_options.merge(
         socket_timeout: 3, connect_timeout: 3,
+        heartbeat_frequency: 100,
         # Uncomment to print all events to stdout:
         #sdam_proc: Utils.subscribe_all_sdam_proc(diagnostic_subscriber),
         **Utils.disable_retries_client_options)
@@ -28,6 +29,14 @@ describe 'SDAM error handling' do
   let(:server) { client.cluster.next_primary }
 
   shared_examples_for 'marks server unknown' do
+    before do
+      server.monitor.stop!
+    end
+
+    after do
+      client.close
+    end
+
     it 'marks server unknown' do
       expect(server).not_to be_unknown
       RSpec::Mocks.with_temporary_scope do
@@ -38,6 +47,14 @@ describe 'SDAM error handling' do
   end
 
   shared_examples_for 'does not mark server unknown' do
+    before do
+      server.monitor.stop!
+    end
+
+    after do
+      client.close
+    end
+
     it 'does not mark server unknown' do
       expect(server).not_to be_unknown
       RSpec::Mocks.with_temporary_scope do

data/spec/integration/sdam_events_spec.rb

@@ -69,7 +69,8 @@ describe 'SDAM events' do
         succeeded_events = subscriber.select_succeeded_events(Mongo::Monitoring::Event::ServerHeartbeatSucceeded)
         # Since we gracefully close the client, we expect each heartbeat
         # to complete.
-        started_events.length.should == succeeded_events.length
+        started_events.length.should > 1
+        (succeeded_events.length-1..succeeded_events.length).should include(started_events.length)
       end
     end
 
@@ -105,10 +106,12 @@ describe 'SDAM events' do
         (succeeded_awaited = events.select(&:awaited?)).should_not be_empty
         (succeeded_regular = events.reject(&:awaited?)).should_not be_empty
 
-        # Since we gracefully close the client, we expect each heartbeat
-        # to complete.
-        started_awaited.length.should == succeeded_awaited.length
-        started_regular.length.should == succeeded_regular.length
+        # There may be in-flight ismasters that don't complete, both
+        # regular and awaited.
+        started_awaited.length.should > 1
+        (succeeded_awaited.length-1..succeeded_awaited.length).should include(started_awaited.length)
+        started_regular.length.should > 1
+        (succeeded_regular.length-1..succeeded_regular.length).should include(started_regular.length)
       end
     end
   end

data/spec/integration/transactions_examples_spec.rb

@@ -4,28 +4,42 @@ describe 'Transactions examples' do
   require_wired_tiger
   require_transaction_support
 
+  let(:client) do
+    authorized_client.with(read_concern: {level: :majority}, write: {w: :majority})
+  end
+
   let(:hr) do
-    authorized_client.use(:hr).database
+    client.use(:hr).database
   end
 
   let(:reporting) do
-    authorized_client.use(:reporting).database
+    client.use(:reporting).database
   end
 
   before(:each) do
     hr[:employees].insert_one(employee: 3, status: 'Active')
+
+    # Sanity check since this test likes to fail
+    employee = hr[:employees].find({ employee: 3 }, limit: 1).first
+    expect(employee).to_not be_nil
+
     reporting[:events].insert_one(employee: 3, status: { new: 'Active', old: nil})
   end
 
   after(:each) do
     hr.drop
     reporting.drop
+
+    # Work around https://jira.mongodb.org/browse/SERVER-53015
+    ::Utils.mongos_each_direct_client do |client|
+      client.database.command(flushRouterConfig: 1)
+    end
   end
 
   context 'individual examples' do
 
     let(:session) do
-      authorized_client.start_session
+      client.start_session
     end
 
     # Start Transactions Intro Example 1
@@ -142,10 +156,6 @@ describe 'Transactions examples' do
 
   context 'Transactions Retry Example 3 (combined example)' do
 
-    let(:client) do
-      authorized_client
-    end
-
     let(:run_transaction) do
 
       # Start Transactions Retry Example 3

data/spec/lite_spec_helper.rb

@@ -1,3 +1,5 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "shared", "lib"))
+
 COVERAGE_MIN = 90
 CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 
@@ -67,8 +69,8 @@ unless SpecConfig.instance.client_debug?
 end
 Encoding.default_external = Encoding::UTF_8
 
+require 'mrss/lite_constraints'
 require 'support/matchers'
-require 'support/lite_constraints'
 require 'support/event_subscriber'
 require 'support/common_shortcuts'
 require 'support/client_registry'
@@ -89,7 +91,7 @@ end
 RSpec.configure do |config|
   config.extend(CommonShortcuts::ClassMethods)
   config.include(CommonShortcuts::InstanceMethods)
-  config.extend(LiteConstraints)
+  config.extend(Mrss::LiteConstraints)
   config.include(ClientRegistryMacros)
 
   if SpecConfig.instance.ci?
@@ -106,7 +108,7 @@ RSpec.configure do |config|
     end
   end
 
-  if SpecConfig.instance.ci?
+  if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
     # Allow a max of 30 seconds per test.
     # Tests should take under 10 seconds ideally but it seems
     # we have some that run for more than 10 seconds in CI.

data/spec/mongo/auth/user_spec.rb

@@ -55,7 +55,7 @@ describe Mongo::Auth::User do
       let(:options) { {auth_mech: 'scram'} }
 
       context 'not linting' do
-        skip_if_linting
+        require_no_linting
 
         it 'warns' do
           expect(Mongo::Logger.logger).to receive(:warn)

data/spec/mongo/bulk_write_spec.rb

@@ -1335,7 +1335,7 @@ describe Mongo::BulkWrite do
             context 'when the number of updates exceeds the max batch size' do
               # Test uses doubles for server descriptions, doubles are
               # incompatible with freezing which linting does for descriptions
-              skip_if_linting
+              require_no_linting
 
               let(:batch_size) do
                 11
@@ -2012,7 +2012,7 @@ describe Mongo::BulkWrite do
       context 'when the operations need to be split' do
         # Test uses doubles for server descriptions, doubles are
         # incompatible with freezing which linting does for descriptions
-        skip_if_linting
+        require_no_linting
 
         let(:batch_size) do
           11

data/spec/mongo/client_construction_spec.rb

@@ -845,7 +845,7 @@ describe Mongo::Client do
         end
 
         context 'mri' do
-          only_mri
+          require_mri
 
           let(:platform_string) do
             [
@@ -1312,7 +1312,7 @@ describe Mongo::Client do
         end
 
         context 'when not linting' do
-          skip_if_linting
+          require_no_linting
 
           it 'rejects bogus read preference as symbol' do
             expect do
@@ -1359,7 +1359,7 @@ describe Mongo::Client do
         end
 
         context 'when read concern has an invalid key' do
-          skip_if_linting
+          require_no_linting
 
           let(:options) do
             { read_concern: { hello: :local } }

data/spec/mongo/client_encryption_spec.rb

@@ -268,7 +268,7 @@ describe Mongo::ClientEncryption do
         it_behaves_like 'it creates a data key'
       end
 
-      context 'with invalid endpoint' do
+      context 'with https' do
         let(:options) do
           {
             master_key: {
@@ -279,20 +279,26 @@ describe Mongo::ClientEncryption do
           }
         end
 
-        let(:expected_message) do
-          # RUBY-2129: This error message could be more specific and inform the user
-          # that there is a problem with their KMS endpoint
-          if BSON::Environment.jruby?
-            /getservbyname.* failed/
-          else
-            /SocketError/
-          end
+        it_behaves_like 'it creates a data key'
+      end
+
+      context 'with invalid endpoint' do
+        let(:options) do
+          {
+            master_key: {
+              key: aws_arn,
+              region: aws_region,
+              endpoint: "invalid-nonsense-endpoint.com"
+            }
+          }
         end
 
         it 'raises an exception' do
+          # RUBY-2129: This error message could be more specific and inform the user
+          # that there is a problem with their KMS endpoint
           expect do
             data_key_id
-          end.to raise_error(Mongo::Error::KmsError, expected_message)
+          end.to raise_error(Mongo::Error::KmsError, /SocketError/)
         end
       end
 

data/spec/mongo/client_spec.rb

@@ -727,6 +727,13 @@ describe Mongo::Client do
       expect(new_id).not_to eql(old_id)
     end
 
+    it 'replaces the session pool' do
+      old_id = client.cluster.session_pool.object_id
+      client.reconnect
+      new_id = client.cluster.session_pool.object_id
+      expect(new_id).not_to eql(old_id)
+    end
+
     it 'returns true' do
       expect(client.reconnect).to be(true)
     end

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -565,7 +565,7 @@ describe Mongo::Cluster::Topology::ReplicaSetNoPrimary do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

data/spec/mongo/cluster/topology/sharded_spec.rb

@@ -135,7 +135,7 @@ describe Mongo::Cluster::Topology::Sharded do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc1) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

data/spec/mongo/cluster/topology/single_spec.rb

@@ -175,7 +175,7 @@ describe Mongo::Cluster::Topology::Single do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

data/spec/mongo/cluster/topology/unknown_spec.rb

@@ -86,7 +86,7 @@ describe Mongo::Cluster::Topology::Unknown do
   end
 
   describe '#summary' do
-    skip_if_linting
+    require_no_linting
 
     let(:desc) do
       Mongo::Server::Description.new(Mongo::Address.new('127.0.0.2:27017'))

data/spec/mongo/cluster/topology_spec.rb

@@ -111,7 +111,7 @@ describe Mongo::Cluster::Topology do
   end
 
   describe '#logical_session_timeout' do
-    skip_if_linting
+    require_no_linting
 
     let(:listeners) do
       Mongo::Event::Listeners.new

data/spec/mongo/collection/view/change_stream_resume_spec.rb

@@ -183,7 +183,7 @@ describe Mongo::Collection::View::ChangeStream do
 
   context 'when a killCursors command is issued for the cursor' do
     context 'using Enumerable' do
-      only_mri
+      require_mri
 
       before do
         change_stream

data/spec/mongo/collection/view/readable_spec.rb

@@ -602,6 +602,42 @@ describe Mongo::Collection::View::Readable do
     end
   end
 
+  describe "#estimated_document_count" do
+
+   let(:documents) do
+      (1..10).map{ |i| { field: "test#{i}" }}
+   end
+
+   before do
+    authorized_collection.delete_many
+    authorized_collection.insert_many(documents)
+   end
+
+    let(:result) do
+      view.estimated_document_count(options)
+    end
+
+    context 'when a selector is provided' do
+
+      let(:selector) do
+        { field: 'test1' }
+      end
+
+      it 'raises an error' do
+        expect {
+          result
+        }.to raise_error(ArgumentError, "Cannot call estimated_document_count when querying with a filter")
+      end
+    end
+
+    context 'when no selector is provided' do
+
+      it 'returns the estimated count of matching documents' do
+        expect(view.estimated_document_count).to eq(10)
+      end
+    end
+  end
+
   describe '#distinct' do
 
     context 'when incorporating read concern' do

data/spec/mongo/collection_spec.rb

@@ -1845,6 +1845,18 @@ describe Mongo::Collection do
       end
     end
 
+    context 'when the document is nil' do
+      let(:result) do
+        authorized_collection.insert_one(nil)
+      end
+
+      it 'raises an ArgumentError' do
+       expect {
+         result
+       }.to raise_error(ArgumentError, "Document to be inserted cannot be nil")
+     end
+    end
+
     context 'when the insert fails' do
 
       let(:result) do

data/spec/mongo/crypt/binary_spec.rb

@@ -1,9 +1,4 @@
-require 'mongo'
-require 'support/lite_constraints'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe Mongo::Crypt::Binary do
   require_libmongocrypt

data/spec/mongo/crypt/binding/binary_spec.rb

@@ -1,9 +1,4 @@
-require 'mongo'
-require 'support/lite_constraints'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'binary_t bindings' do

data/spec/mongo/crypt/binding/context_spec.rb

@@ -1,10 +1,5 @@
-require 'mongo'
-require 'support/lite_constraints'
-require 'mongo/crypt/helpers/mongo_crypt_spec_helper'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
+require_relative '../helpers/mongo_crypt_spec_helper'
 
 shared_context 'initialized for data key creation' do
   let(:master_key) { "ru\xfe\x00" * 24 }

data/spec/mongo/crypt/binding/helpers_spec.rb

@@ -1,9 +1,4 @@
-require 'mongo'
-require 'support/lite_constraints'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'helper methods' do

data/spec/mongo/crypt/binding/mongocrypt_spec.rb

@@ -1,10 +1,5 @@
-require 'mongo'
-require 'support/lite_constraints'
-require 'mongo/crypt/helpers/mongo_crypt_spec_helper'
-
-RSpec.configure do |config|
-  config.extend(LiteConstraints)
-end
+require 'lite_spec_helper'
+require_relative '../helpers/mongo_crypt_spec_helper'
 
 describe 'Mongo::Crypt::Binding' do
   describe 'mongocrypt_t binding' do