mongo 2.11.4 → 2.12.3

data/spec/mongo/protocol/registry_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require 'lite_spec_helper'
 
 describe Mongo::Protocol::Registry do
 

data/spec/mongo/protocol/reply_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'lite_spec_helper'
 
 describe Mongo::Protocol::Reply do
 

data/spec/mongo/protocol/update_spec.rb

@@ -1,17 +1,18 @@
-require 'spec_helper'
+require 'lite_spec_helper'
+require 'support/shared/protocol'
 
 describe Mongo::Protocol::Update do
 
   let(:opcode)   { 2001 }
   let(:db)       { SpecConfig.instance.test_db }
-  let(:coll)     { TEST_COLL }
-  let(:ns)       { "#{db}.#{coll}" }
+  let(:collection_name) { 'protocol-test' }
+  let(:ns)       { "#{db}.#{collection_name}" }
   let(:selector) { { :name => 'Tyler' } }
   let(:update_doc) { { :name => 'Bob' } }
   let(:options)       { Hash.new }
 
   let(:message) do
-    described_class.new(db, coll, selector, update_doc, options)
+    described_class.new(db, collection_name, selector, update_doc, options)
   end
 
   describe '#initialize' do
@@ -35,7 +36,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the fields are equal' do
         let(:other) do
-          described_class.new(db, coll, selector, update_doc, options)
+          described_class.new(db, collection_name, selector, update_doc, options)
         end
 
         it 'returns true' do
@@ -45,7 +46,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the database is not equal' do
         let(:other) do
-          described_class.new('tyler', coll, selector, update_doc, options)
+          described_class.new('tyler', collection_name, selector, update_doc, options)
         end
 
         it 'returns false' do
@@ -65,7 +66,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the selector is not equal' do
         let(:other) do
-          described_class.new(db, coll, { :a => 1 }, update_doc, options)
+          described_class.new(db, collection_name, { :a => 1 }, update_doc, options)
         end
 
         it 'returns false' do
@@ -75,7 +76,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the update document is not equal' do
         let(:other) do
-          described_class.new(db, coll, selector, { :a => 1 }, options)
+          described_class.new(db, collection_name, selector, { :a => 1 }, options)
         end
 
         it 'returns false' do
@@ -85,7 +86,7 @@ describe Mongo::Protocol::Update do
 
       context 'when the options are not equal' do
         let(:other) do
-          described_class.new(db, coll, selector, update_doc,
+          described_class.new(db, collection_name, selector, update_doc,
                               :flags => :upsert)
         end
 

data/spec/mongo/server/connection_pool_spec.rb

@@ -487,7 +487,7 @@ describe Mongo::Server::ConnectionPool do
           expect {
             pool.check_out
             pool.check_out
-          }.to raise_error(Timeout::Error)
+          }.to raise_error(::Timeout::Error)
           expect(pool.size).to eq(1)
         end
       end

data/spec/mongo/server/connection_spec.rb

@@ -532,7 +532,9 @@ describe Mongo::Server::Connection, retry: 3 do
           user: SpecConfig.instance.test_user.name,
           password: SpecConfig.instance.test_user.password,
         ))
-      )
+      ).tap do |connection|
+        connection.connect!
+      end
     end
 
     let(:documents) do
@@ -627,14 +629,24 @@ describe Mongo::Server::Connection, retry: 3 do
       context 'linting' do
         require_linting
 
-        it 'marks the connection no longer usable' do
+        it 'does not permit sending over the connection' do
           expect {
             connection.dispatch([ query_alice ])
           }.to raise_error(Mongo::Error::UnexpectedResponse)
 
           expect do
             connection.dispatch([ query_alice ]).documents
-          end.to raise_error(Mongo::Error::LintError, /Reconnecting closed connections is no longer supported.*/)
+          end.to raise_error(Mongo::Error::LintError, /Trying to deliver a message over a disconnected connection/)
+        end
+
+        it 'marks the connection no longer usable' do
+          expect {
+            connection.dispatch([ query_alice ])
+          }.to raise_error(Mongo::Error::UnexpectedResponse)
+
+          expect do
+            connection.connect!
+          end.to raise_error(Mongo::Error::LintError, /Reconnecting closed connections is no longer supported/)
         end
       end
 
@@ -714,9 +726,15 @@ describe Mongo::Server::Connection, retry: 3 do
       end
 
       context 'when the message is a command' do
+        # Server description is frozen when linting is enabled, which is
+        # incompatible with expectations set on it in this test
+        skip_if_linting
 
         let(:selector) do
-          { :getlasterror => '1' }
+          # The driver allows up to 16KiB for command overhead on top of
+          # the max bson object size reported by the server.
+          # Add that much padding.
+          { :getlasterror => '1', 'padding' => 'x'*16384 }
         end
 
         let(:command) do
@@ -730,7 +748,8 @@ describe Mongo::Server::Connection, retry: 3 do
         it 'checks the size against the max bson size' do
           # 100 works for non-x509 auth.
           # 10 is needed for x509 auth due to smaller payloads, apparently.
-          expect_any_instance_of(Mongo::Server).to receive(:max_bson_object_size).at_least(:once).and_return(10)
+          expect_any_instance_of(Mongo::Server::Description).to receive(
+            :max_bson_object_size).at_least(:once).and_return(10)
           expect do
             reply
           end.to raise_exception(Mongo::Error::MaxBSONSize)
@@ -862,7 +881,9 @@ describe Mongo::Server::Connection, retry: 3 do
       context 'when the socket_timeout is negative' do
 
         let(:connection) do
-          described_class.new(server, server.options)
+          described_class.new(server, server.options).tap do |connection|
+            connection.connect!
+          end
         end
 
         let(:message) do
@@ -871,7 +892,7 @@ describe Mongo::Server::Connection, retry: 3 do
 
         before do
           expect(message).to receive(:replyable?) { false }
-          connection.send(:deliver, message)
+          connection.send(:deliver, message, nil)
 
           connection.send(:socket).instance_variable_set(:@timeout, -(Time.now.to_i))
         end

data/spec/mongo/socket_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Mongo::Socket do
 
   let(:socket) do
-    described_class.new(Socket::PF_INET)
+    described_class.new
   end
 
   describe '#address' do

data/spec/mongo/srv/monitor_spec.rb

@@ -1,82 +1,101 @@
 require 'lite_spec_helper'
 
-describe Mongo::SRV::Monitor do
+describe Mongo::Srv::Monitor do
   describe '#scan!' do
     let(:hostname) do
-      'test1.test.build.10gen.cc.'
+      'test1.test.build.10gen.cc'
     end
 
     let(:hosts) do
       [
-        'localhost.test.build.10gen.cc.:27017',
-        'localhost.test.build.10gen.cc.:27018',
+        'localhost.test.build.10gen.cc:27017',
+        'localhost.test.build.10gen.cc:27018',
       ]
     end
 
-    let(:records) do
-      double('records').tap do |records|
-        allow(records).to receive(:hostname).and_return(hostname)
-        allow(records).to receive(:hosts).and_return(hosts)
-        allow(records).to receive(:empty?).and_return(false)
-        allow(records).to receive(:min_ttl).and_return(nil)
+    let(:result) do
+      double('result').tap do |result|
+        allow(result).to receive(:hostname).and_return(hostname)
+        allow(result).to receive(:address_strs).and_return(hosts)
+        allow(result).to receive(:empty?).and_return(false)
+        allow(result).to receive(:min_ttl).and_return(nil)
       end
     end
 
+    let(:uri_resolver) do
+      double('uri resolver').tap do |resolver|
+        expect(resolver).to receive(:get_records).and_return(result)
+      end
+    end
+
+    let(:srv_uri) do
+      Mongo::URI.get("mongodb+srv://this.is.not.used")
+    end
 
     let(:cluster) do
-      Mongo::Cluster.new(records.hosts, Mongo::Monitoring.new, { monitoring_io: false })
+      Mongo::Cluster.new(hosts, Mongo::Monitoring.new, monitoring_io: false)
     end
 
-    let(:monitoring) do
-      described_class.new(cluster, resolver, records)
+    let(:monitor) do
+      described_class.new(cluster, srv_uri: srv_uri)
     end
 
     before do
-      monitoring.scan!
+      # monitor instantiation triggers cluster instantiation which
+      # performs real SRV lookups for the hostname.
+      # The next lookup (the one performed when cluster is already set up)
+      # is using our doubles.
+      RSpec::Mocks.with_temporary_scope do
+        allow(uri_resolver).to receive(:get_txt_options_string)
+        expect(Mongo::Srv::Resolver).to receive(:new).ordered.and_return(uri_resolver)
+        allow(resolver).to receive(:get_txt_options_string)
+        expect(Mongo::Srv::Resolver).to receive(:new).ordered.and_return(resolver)
+        monitor.send(:scan!)
+      end
     end
 
     context 'when a new DNS record is added' do
       let(:new_hosts) do
-        hosts + ['test1.test.build.10gen.cc.:27019']
+        hosts + ['localhost.test.build.10gen.cc:27019']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
-        double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+        double('monitor resolver').tap do |resolver|
+          expect(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
       it 'adds the new host to the cluster' do
-        expect(cluster.addresses.map(&:to_s).sort).to eq(new_hosts.sort)
+        expect(cluster.servers_list.map(&:address).map(&:to_s).sort).to eq(new_hosts.sort)
       end
     end
 
     context 'when a DNS record is removed' do
       let(:new_hosts) do
-        hosts - ['test1.test.build.10gen.cc.:27018']
+        hosts - ['test1.test.build.10gen.cc:27018']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -87,21 +106,21 @@ describe Mongo::SRV::Monitor do
 
     context 'when a single DNS record is replaced' do
       let(:new_hosts) do
-        hosts - ['test1.test.build.10gen.cc.:27018'] +  ['test1.test.build.10gen.cc.:27019']
+        hosts - ['test1.test.build.10gen.cc:27018'] +  ['test1.test.build.10gen.cc:27019']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -110,23 +129,23 @@ describe Mongo::SRV::Monitor do
       end
     end
 
-    context 'when all DNS records are replaced with a single record' do
+    context 'when all DNS result are replaced with a single record' do
       let(:new_hosts) do
-        ['test1.test.build.10gen.cc.:27019']
+        ['test1.test.build.10gen.cc:27019']
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          expect(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -135,26 +154,26 @@ describe Mongo::SRV::Monitor do
       end
     end
 
-    context 'when all DNS records are replaced with multiple records' do
+    context 'when all DNS result are replaced with multiple result' do
       let(:new_hosts) do
         [
-          'test1.test.build.10gen.cc.:27019',
-          'test1.test.build.10gen.cc.:27020',
+          'test1.test.build.10gen.cc:27019',
+          'test1.test.build.10gen.cc:27020',
         ]
       end
 
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return(new_hosts)
-          allow(records).to receive(:empty?).and_return(false)
-          allow(records).to receive(:min_ttl).and_return(nil)
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return(new_hosts)
+          allow(result).to receive(:empty?).and_return(false)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -166,7 +185,7 @@ describe Mongo::SRV::Monitor do
     context 'when the DNS lookup times out' do
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_raise(Resolv::ResolvTimeout)
+          expect(resolver).to receive(:get_records).and_raise(Resolv::ResolvTimeout)
         end
       end
 
@@ -187,19 +206,19 @@ describe Mongo::SRV::Monitor do
       end
     end
 
-    context 'when no DNS records are returned' do
-      let(:new_records) do
-        double('records').tap do |records|
-          allow(records).to receive(:hostname).and_return(hostname)
-          allow(records).to receive(:hosts).and_return([])
-          allow(records).to receive(:empty?).and_return(true)
-          allow(records).to receive(:min_ttl).and_return(nil)
+    context 'when no DNS result are returned' do
+      let(:new_result) do
+        double('result').tap do |result|
+          allow(result).to receive(:hostname).and_return(hostname)
+          allow(result).to receive(:address_strs).and_return([])
+          allow(result).to receive(:empty?).and_return(true)
+          allow(result).to receive(:min_ttl).and_return(nil)
         end
       end
 
       let(:resolver) do
         double('resolver').tap do |resolver|
-          allow(resolver).to receive(:get_records).and_return(new_records)
+          allow(resolver).to receive(:get_records).and_return(new_result)
         end
       end
 
@@ -208,4 +227,4 @@ describe Mongo::SRV::Monitor do
       end
     end
   end
-end
+end