mongo 2.12.1 → 2.13.0

data/spec/mongo/server_selector/secondary_spec.rb

@@ -12,6 +12,7 @@ describe Mongo::ServerSelector::Secondary do
   it_behaves_like 'a server selector with sensitive data in its options'
 
   it_behaves_like 'a server selector accepting tag sets'
+  it_behaves_like 'a server selector accepting hedge'
 
   describe '#initialize' do
 
@@ -105,13 +106,13 @@ describe Mongo::ServerSelector::Secondary do
     end
   end
 
-  describe '#select' do
+  describe '#select_in_replica_set' do
 
     context 'no candidates' do
       let(:candidates) { [] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -119,7 +120,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [primary] }
 
       it 'returns an empty array' do
-        expect(selector.send(:select, candidates)).to be_empty
+        expect(selector.send(:select_in_replica_set, candidates)).to be_empty
       end
     end
 
@@ -127,7 +128,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [secondary] }
 
       it 'returns array with secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -135,7 +136,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [primary, secondary] }
 
       it 'returns array with secondary' do
-        expect(selector.send(:select, candidates)).to eq([secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
       end
     end
 
@@ -143,7 +144,7 @@ describe Mongo::ServerSelector::Secondary do
       let(:candidates) { [secondary, secondary, primary] }
 
       it 'returns array with all secondaries' do
-        expect(selector.send(:select, candidates)).to eq([secondary, secondary])
+        expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary, secondary])
       end
     end
 
@@ -157,7 +158,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -165,7 +166,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [secondary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -173,7 +174,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [matching_secondary] }
 
           it 'returns an array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
       end
@@ -184,7 +185,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary, secondary, secondary] }
 
           it 'returns an emtpy array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -192,7 +193,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [secondary, matching_secondary]}
 
           it 'returns array with matching secondary' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary])
           end
         end
 
@@ -200,7 +201,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [matching_secondary, matching_secondary] }
 
           it 'returns an array with both matching secondaries' do
-            expect(selector.send(:select, candidates)).to eq([matching_secondary, matching_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([matching_secondary, matching_secondary])
           end
         end
       end
@@ -216,7 +217,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_primary] }
 
           it 'returns an empty array' do
-            expect(selector.send(:select, candidates)).to be_empty
+            expect(selector.send(:select_in_replica_set, candidates)).to be_empty
           end
         end
 
@@ -224,7 +225,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
       end
@@ -235,7 +236,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [primary, far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
 
@@ -243,7 +244,7 @@ describe Mongo::ServerSelector::Secondary do
           let(:candidates) { [far_primary, far_secondary] }
 
           it 'returns an array with the secondary' do
-            expect(selector.send(:select, candidates)).to eq([far_secondary])
+            expect(selector.send(:select_in_replica_set, candidates)).to eq([far_secondary])
           end
         end
 
@@ -253,7 +254,7 @@ describe Mongo::ServerSelector::Secondary do
             let(:candidates) { [primary, secondary, far_secondary] }
 
             it 'returns an array with near secondary' do
-              expect(selector.send(:select, candidates)).to eq([secondary])
+              expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary])
             end
           end
 
@@ -261,7 +262,7 @@ describe Mongo::ServerSelector::Secondary do
             let(:candidates) { [far_primary, secondary, secondary] }
 
             it 'returns an array with two secondaries' do
-              expect(selector.send(:select, candidates)).to eq([secondary, secondary])
+              expect(selector.send(:select_in_replica_set, candidates)).to eq([secondary, secondary])
             end
           end
         end

data/spec/mongo/server_selector_spec.rb

@@ -198,7 +198,7 @@ describe Mongo::ServerSelector do
   describe "#select_server" do
     skip_if_linting
 
-    context 'when #select returns a list of nils' do
+    context 'when #select_in_replica_set returns a list of nils' do
 
       let(:servers) do
         [ make_server(:primary) ]
@@ -224,7 +224,7 @@ describe Mongo::ServerSelector do
 
       let(:read_pref) do
         described_class.get(mode: :primary).tap do |pref|
-          allow(pref).to receive(:select).and_return([ nil, nil ])
+          allow(pref).to receive(:select_in_replica_set).and_return([ nil, nil ])
         end
       end
 
@@ -313,7 +313,6 @@ describe Mongo::ServerSelector do
 
       it 'uses the local_threshold of the cluster' do
         expect(topology).to receive(:compatible?).and_return(true)
-        expect(topology).to receive(:single?).and_return(false)
         expect(read_pref.select_server(cluster)).to eq(near_server)
       end
     end
@@ -565,7 +564,7 @@ describe Mongo::ServerSelector do
     end
   end
 
-  describe '#candidates' do
+  describe '#suitable_servers' do
     let(:selector) { Mongo::ServerSelector::Primary.new(options) }
 
     let(:cluster) { double('cluster') }
@@ -603,7 +602,7 @@ describe Mongo::ServerSelector do
           end
 
           it 'returns an empty list' do
-            expect(selector.candidates(cluster)).to eq([])
+            expect(selector.suitable_servers(cluster)).to eq([])
           end
         end
       end

data/spec/mongo/session/session_pool_spec.rb

@@ -157,8 +157,12 @@ describe Mongo::Session::SessionPool do
       pool.checkout
     end
 
+    let(:subscriber) { EventSubscriber.new }
+
     let(:client) do
-      subscribed_client
+      authorized_client.tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+      end
     end
 
     context 'when the number of ids is not larger than 10,000' do
@@ -175,7 +179,7 @@ describe Mongo::Session::SessionPool do
 
       let(:end_sessions_command) do
         pool.end_sessions
-        EventSubscriber.started_events.find { |c| c.command_name == 'endSessions'}
+        subscriber.started_events.find { |c| c.command_name == 'endSessions'}
       end
 
       it 'sends the endSessions command with all the session ids' do
@@ -219,7 +223,7 @@ describe Mongo::Session::SessionPool do
       end
 
       let(:end_sessions_commands) do
-        EventSubscriber.started_events.select { |c| c.command_name == 'endSessions'}
+        subscriber.started_events.select { |c| c.command_name == 'endSessions'}
       end
 
       it 'sends the command more than once' do

data/spec/mongo/session_spec.rb

@@ -307,4 +307,39 @@ describe Mongo::Session do
       end
     end
   end
+
+  describe '#start_session' do
+    context 'when block doesn\'t raise an error' do 
+      it 'closes the session after the block' do 
+        block_session = nil
+        authorized_client.start_session do |session| 
+          expect(session.ended?).to be false
+          block_session = session 
+        end
+        expect(block_session.ended?).to be true
+      end
+    end
+
+    context 'when block raises an error' do
+      it 'closes the session after the block' do
+        block_session = nil
+        expect do 
+          authorized_client.start_session do |session|
+            block_session = session
+            raise 'This is an error!'
+          end
+        end.to raise_error(StandardError, 'This is an error!')
+        expect(block_session.ended?).to be true
+      end
+    end
+
+    context 'when block returns value' do
+      it 'is returned by the function' do
+        res = authorized_client.start_session do |session| 
+          4
+        end
+        expect(res).to be 4
+      end
+    end
+  end
 end

data/spec/mongo/socket/ssl_spec.rb

@@ -42,10 +42,10 @@ describe Mongo::Socket::SSL, retry: 3 do
     OpenSSL::PKey.read(key_string)
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'returns the address and tls indicator' do
       addr = socket.instance_variable_get(:@tcp_socket).remote_address
-      expect(socket.send(:address)).to eq("#{addr.ip_address}:#{addr.ip_port} (#{default_address}, TLS)")
+      expect(socket.send(:human_address)).to eq("#{addr.ip_address}:#{addr.ip_port} (#{default_address}, TLS)")
     end
   end
 

data/spec/mongo/socket/tcp_spec.rb

@@ -5,10 +5,10 @@ describe Mongo::Socket::TCP do
     described_class.new('127.0.0.1', SpecConfig.instance.any_port, 5, Socket::AF_INET)
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'returns the address and tls indicator' do
       addr = socket.send(:socket).remote_address
-      expect(socket.send(:address)).to eq("#{addr.ip_address}:#{addr.ip_port} (no TLS)")
+      expect(socket.send(:human_address)).to eq("#{addr.ip_address}:#{addr.ip_port} (no TLS)")
     end
   end
 end

data/spec/mongo/socket/unix_spec.rb

@@ -8,9 +8,9 @@ describe Mongo::Socket::Unix do
     described_class.new(path, 5)
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'returns the path' do
-      expect(socket.send(:address)).to eq(path)
+      expect(socket.send(:human_address)).to eq(path)
     end
   end
 

data/spec/mongo/socket_spec.rb

@@ -3,25 +3,25 @@ require 'spec_helper'
 describe Mongo::Socket do
 
   let(:socket) do
-    described_class.new
+    described_class.new(0, {})
   end
 
-  describe '#address' do
+  describe '#human_address' do
     it 'raises NotImplementedError' do
       expect do
-        socket.send(:address)
+        socket.send(:human_address)
       end.to raise_error(NotImplementedError)
     end
   end
 
-  describe '#handle_errors' do
+  describe '#map_exceptions' do
     before do
-      expect(socket).to receive(:address).and_return('fake-address')
+      expect(socket).to receive(:human_address).and_return('fake-address')
     end
 
     it 'maps timeout exception' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise Errno::ETIMEDOUT
         end
       end.to raise_error(Mongo::Error::SocketTimeoutError)
@@ -29,7 +29,7 @@ describe Mongo::Socket do
 
     it 'maps SystemCallError and preserves message' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise SystemCallError.new('Test error', Errno::ENFILE::Errno)
         end
       end.to raise_error(Mongo::Error::SocketError, 'Errno::ENFILE: Too many open files in system - Test error (for fake-address)')
@@ -37,7 +37,7 @@ describe Mongo::Socket do
 
     it 'maps IOError and preserves message' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise IOError.new('Test error')
         end
       end.to raise_error(Mongo::Error::SocketError, 'IOError: Test error (for fake-address)')
@@ -45,7 +45,7 @@ describe Mongo::Socket do
 
     it 'maps SSLError and preserves message' do
       expect do
-        socket.send(:handle_errors) do
+        socket.send(:map_exceptions) do
           raise OpenSSL::SSL::SSLError.new('Test error')
         end
       end.to raise_error(Mongo::Error::SocketError, 'OpenSSL::SSL::SSLError: Test error (for fake-address) (MongoDB may not be configured with SSL support)')

data/spec/mongo/timeout_spec.rb

@@ -6,79 +6,33 @@ describe Mongo::Timeout do
     let(:custom_error_class) { Mongo::Error::SocketTimeoutError }
     let(:custom_error_message) { 'socket timed out' }
 
-    context 'Ruby version older than 2.4.0' do
-      before do
-        unless RUBY_VERSION < '2.4.0'
-          skip 'This test requires a Ruby version older than 2.4.0'
-        end
-      end
-
-      context 'with time argument' do
-        it 'raises StandardError' do
-          expect do
-            Mongo::Timeout.timeout(0.1) do
-              sleep 1
-            end
-          end.to raise_error(::Timeout::Error, default_error_message)
-        end
-      end
-
-      context 'with time and class arguments' do
-        it 'raises the specified error class' do
-          expect do
-            Mongo::Timeout.timeout(0.1, custom_error_class) do
-              sleep 1
-            end
-          end.to raise_error(custom_error_class, default_error_message)
-        end
-      end
-
-      context 'with time, class, and message arguments' do
-        it 'raises the specified error class but ignores the message' do
-          expect do
-            Mongo::Timeout.timeout(0.1, custom_error_class, custom_error_message) do
-              sleep 1
-            end
-          end.to raise_error(custom_error_class, default_error_message)
-        end
+    context 'with time argument' do
+      it 'raises StandardError' do
+        expect do
+          Mongo::Timeout.timeout(0.1) do
+            sleep 1
+          end
+        end.to raise_error(::Timeout::Error, default_error_message)
       end
     end
 
-    context 'Ruby 2.4.0 or newer' do
-      before do
-        unless RUBY_VERSION >= '2.4.0'
-          skip 'This test requires a Ruby 2.4.0 or newer'
-        end
-      end
-
-      context 'with time argument' do
-        it 'raises StandardError' do
-          expect do
-            Mongo::Timeout.timeout(0.1) do
-              sleep 1
-            end
-          end.to raise_error(::Timeout::Error, default_error_message)
-        end
-      end
-
-      context 'with time and class arguments' do
-        it 'raises the specified error class' do
-          expect do
-            Mongo::Timeout.timeout(0.1, custom_error_class) do
-              sleep 1
-            end
-          end.to raise_error(custom_error_class, default_error_message)
-        end
+    context 'with time and class arguments' do
+      it 'raises the specified error class' do
+        expect do
+          Mongo::Timeout.timeout(0.1, custom_error_class) do
+            sleep 1
+          end
+        end.to raise_error(custom_error_class, default_error_message)
       end
+    end
 
-      context 'with time, class, and message arguments' do
-        it 'raises the specified error class with message' do
-          expect do
-            Mongo::Timeout.timeout(0.1, custom_error_class, custom_error_message) do
-              sleep 1
-            end
-          end.to raise_error(custom_error_class, custom_error_message)
-        end
+    context 'with time, class, and message arguments' do
+      it 'raises the specified error class with message' do
+        expect do
+          Mongo::Timeout.timeout(0.1, custom_error_class, custom_error_message) do
+            sleep 1
+          end
+        end.to raise_error(custom_error_class, custom_error_message)
       end
     end
   end