mongo 2.8.0 → 2.9.0.rc0

data/spec/mongo/client_construction_spec.rb

@@ -155,18 +155,42 @@ describe Mongo::Client do
 
     context 'when providing options' do
 
-      context 'when retry_writes is defined' do
+      context 'retry_writes option' do
+        let(:client) do
+          new_local_client_nmio(SpecConfig.instance.addresses, options)
+        end
 
-        let(:options) do
-          { retry_writes: true }
+        context 'when retry_writes is true' do
+
+          let(:options) do
+            { retry_writes: true }
+          end
+
+          it 'sets retry_writes to true' do
+            expect(client.options['retry_writes']).to be true
+          end
         end
 
-        let(:client) do
-          new_local_client_nmio(SpecConfig.instance.addresses, authorized_client.options.merge(options))
+        context 'when retry_writes is false' do
+
+          let(:options) do
+            { retry_writes: false }
+          end
+
+          it 'sets retry_writes to false' do
+            expect(client.options['retry_writes']).to be false
+          end
         end
 
-        it 'sets the option' do
-          expect(client.options['retry_writes']).to eq(options[:retry_writes])
+        context 'when retry_writes is not given' do
+
+          let(:options) do
+            { }
+          end
+
+          it 'sets retry_writes to true' do
+            expect(client.options['retry_writes']).to be true
+          end
         end
       end
 
@@ -501,7 +525,7 @@ describe Mongo::Client do
 
             let(:options) do
               {
-                :min_pool_size => Mongo::Server::ConnectionPool::Queue::MAX_SIZE
+                :min_pool_size => Mongo::Server::ConnectionPool::DEFAULT_MAX_SIZE
               }
             end
 
@@ -630,7 +654,8 @@ describe Mongo::Client do
 
         let(:expected_options) do
           Mongo::Options::Redacted.new(:write => { :w => 3 },
-            monitoring_io: false, :database => 'testdb')
+            monitoring_io: false, :database => 'testdb', retry_writes: true,
+            retry_reads: true)
         end
 
         it 'sets the options' do
@@ -731,7 +756,8 @@ describe Mongo::Client do
 
         let(:expected_options) do
           Mongo::Options::Redacted.new(:write => { :w => 3 },
-            monitoring_io: false, :database => 'testdb')
+            monitoring_io: false, :database => 'testdb', retry_writes: true,
+            retry_reads: true)
         end
 
         it 'sets the options' do
@@ -751,7 +777,8 @@ describe Mongo::Client do
 
         let(:expected_options) do
           Mongo::Options::Redacted.new(:write => { :w => 4 },
-            monitoring_io: false, :database => 'testdb')
+            monitoring_io: false, :database => 'testdb', retry_writes: true,
+            retry_reads: true)
         end
 
         it 'allows explicit options to take preference' do
@@ -987,16 +1014,14 @@ describe Mongo::Client do
 
       let(:new_options) do
         Mongo::Options::Redacted.new(:read => { :mode => :primary },
-                                             :write => { :w => 1 },
-                                             monitoring_io: false,
-                                             :database => SpecConfig.instance.test_db)
+          :write => { :w => 1 }, monitoring_io: false,
+          :database => SpecConfig.instance.test_db, retry_writes: true, retry_reads: true)
       end
 
       let(:original_options) do
         Mongo::Options::Redacted.new(:read => { :mode => :secondary },
-                                             :write => { :w => 1 },
-                                             monitoring_io: false,
-                                             :database => SpecConfig.instance.test_db)
+          :write => { :w => 1 }, monitoring_io: false,
+          :database => SpecConfig.instance.test_db, retry_writes: true, retry_reads: true)
       end
 
       it 'returns a new client' do

data/spec/mongo/client_spec.rb

@@ -193,6 +193,8 @@ describe Mongo::Client do
       )
     end
 
+    let(:default_options) { Mongo::Options::Redacted.new(retry_writes: true, retry_reads: true) }
+
     let(:options) do
       Mongo::Options::Redacted.new(:read => { :mode => :primary },
                                     :local_threshold => 0.010,
@@ -201,7 +203,7 @@ describe Mongo::Client do
     end
 
     let(:expected) do
-      [client.cluster, options].hash
+      [client.cluster, default_options.merge(options)].hash
     end
 
     it 'returns a hash of the cluster and options' do
@@ -494,6 +496,35 @@ describe Mongo::Client do
     end
   end
 
+  [
+    [:max_read_retries, 1],
+    [:read_retry_interval, 5],
+    [:max_write_retries, 1],
+  ].each do |opt, default|
+    describe "##{opt}" do
+      let(:client_options) { {} }
+
+      let(:client) do
+        Mongo::Client.new(['127.0.0.1:27017'], {monitoring_io: false}.update(client_options))
+      end
+
+      it "defaults to #{default}" do
+        expect(default).not_to be nil
+        expect(client.options[opt]).to be nil
+        expect(client.send(opt)).to eq(default)
+      end
+
+      context 'specified on client' do
+        let(:client_options) { {opt => 2} }
+
+        it 'inherits from client' do
+          expect(client.options[opt]).to eq(2)
+          expect(client.send(opt)).to eq(2)
+        end
+      end
+    end
+  end
+
   describe '#database_names' do
 
     it 'returns a list of database names' do

data/spec/mongo/cluster/socket_reaper_spec.rb

@@ -21,11 +21,11 @@ describe Mongo::Cluster::SocketReaper do
 
     before do
       cluster.servers.each do |s|
-        expect(s.pool).to receive(:close_stale_sockets!).and_call_original
+        expect(s.pool).to receive(:close_idle_sockets).and_call_original
       end
     end
 
-    it 'calls close_stale_sockets on each connection pool in the cluster' do
+    it 'calls close_idle_sockets on each connection pool in the cluster' do
       reaper.execute
     end
   end

data/spec/mongo/cluster_spec.rb

@@ -640,14 +640,48 @@ describe Mongo::Cluster do
     end
   end
 
+  [
+    [:max_read_retries, 1],
+    [:read_retry_interval, 5],
+  ].each do |opt, default|
+    describe "##{opt}" do
+      let(:client_options) { {} }
+
+      let(:client) do
+        Mongo::Client.new(['127.0.0.1:27017'], {monitoring_io: false}.update(client_options))
+      end
+
+      let(:cluster) do
+        client.cluster
+      end
+
+      it "defaults to #{default}" do
+        expect(default).not_to be nil
+        expect(client.options[opt]).to be nil
+        expect(cluster.send(opt)).to eq(default)
+      end
+
+      context 'specified on client' do
+        let(:client_options) { {opt => 2} }
+
+        it 'inherits from client' do
+          expect(client.options[opt]).to eq(2)
+          expect(cluster.send(opt)).to eq(2)
+        end
+      end
+    end
+  end
+
   describe '#summary' do
+    let(:default_address) { SpecConfig.instance.addresses.first }
+
     context 'cluster has unknown servers' do
       it 'includes unknown servers' do
         cluster.servers_list.each do |server|
           expect(server).to be_unknown
         end
 
-        expect(cluster.summary).to match(/Server address=localhost/)
+        expect(cluster.summary).to match(/Server address=#{default_address}/)
       end
     end
 
@@ -664,7 +698,7 @@ describe Mongo::Cluster do
           expect(server).not_to be_unknown
         end
 
-        expect(cluster.summary).to match(/Server address=localhost/)
+        expect(cluster.summary).to match(/Server address=#{default_address}/)
       end
     end
   end

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

@@ -219,6 +219,8 @@ describe Mongo::Collection::View::Aggregation do
   end
 
   describe '#explain' do
+    # Broken on 4.2 - https://jira.mongodb.org/browse/RUBY-1788
+    max_server_version '4.0'
 
     it 'executes an explain' do
       expect(aggregation.explain).to_not be_empty

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

@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Mongo::Collection::View::ChangeStream do
   min_server_fcv '3.6'
   require_topology :replica_set
+  max_example_run_time 7
 
   let(:pipeline) do
     []
@@ -16,8 +17,16 @@ describe Mongo::Collection::View::ChangeStream do
     {}
   end
 
+  let(:client) do
+    authorized_client_without_any_retry_reads
+  end
+
+  let(:collection) do
+    client['mcv-change-stream']
+  end
+
   let(:view) do
-    Mongo::Collection::View.new(authorized_collection, {}, view_options)
+    Mongo::Collection::View.new(collection, {}, view_options)
   end
 
   let(:change_stream) do
@@ -30,8 +39,8 @@ describe Mongo::Collection::View::ChangeStream do
   end
 
   let!(:sample_resume_token) do
-    stream = authorized_collection.watch
-    authorized_collection.insert_one(a: 1)
+    stream = collection.watch
+    collection.insert_one(a: 1)
     doc = stream.to_enum.next
     stream.close
     doc[:_id]
@@ -61,7 +70,7 @@ describe Mongo::Collection::View::ChangeStream do
   end
 
   before do
-    authorized_collection.delete_many
+    collection.delete_many
   end
 
   after do
@@ -172,7 +181,8 @@ describe Mongo::Collection::View::ChangeStream do
     context 'when the collection has a readConcern' do
 
       let(:collection) do
-        authorized_collection.with(read_concern: { level: 'majority' })
+        client['mcv-change-stream'].with(
+          read_concern: { level: 'majority' })
       end
 
       let(:view) do
@@ -242,10 +252,6 @@ describe Mongo::Collection::View::ChangeStream do
             client.start_session
           end
 
-          let(:client) do
-            authorized_client
-          end
-
           it 'raises an error' do
             expect(operation_result.class).to eq(Mongo::Error::OperationFailure)
           end
@@ -281,14 +287,10 @@ describe Mongo::Collection::View::ChangeStream do
 
       let(:operation) do
         change_stream
-        authorized_collection.insert_one(a: 1)
+        collection.insert_one(a: 1)
         change_stream.to_enum.next
       end
 
-      let(:client) do
-        authorized_client
-      end
-
       context 'when the session is created from the same client used for the operation' do
 
         let(:session) do
@@ -327,7 +329,7 @@ describe Mongo::Collection::View::ChangeStream do
       context 'when a session from another client is provided' do
 
         let(:session) do
-          another_authorized_client.start_session
+          another_authorized_client.with(retry_reads: false).start_session
         end
 
         let(:operation_result) do
@@ -390,7 +392,7 @@ describe Mongo::Collection::View::ChangeStream do
 
       before do
         change_stream
-        authorized_collection.insert_one(a: 1)
+        collection.insert_one(a: 1)
         enum.next
         change_stream.close
       end
@@ -438,7 +440,7 @@ describe Mongo::Collection::View::ChangeStream do
 
     before do
       change_stream
-      authorized_collection.insert_one(a: 1)
+      collection.insert_one(a: 1)
     end
 
     context 'pre-4.1 server' do
@@ -467,8 +469,6 @@ describe Mongo::Collection::View::ChangeStream do
   context 'when an error is encountered the first time the command is run' do
     include PrimarySocket
 
-    let(:client) { authorized_collection.client }
-
     before do
       expect(primary_socket).to receive(:write).and_raise(error).once
     end
@@ -482,7 +482,7 @@ describe Mongo::Collection::View::ChangeStream do
       before do
         expect(view.send(:server_selector)).to receive(:select_server).twice.and_call_original
         change_stream
-        authorized_collection.insert_one(a: 1)
+        collection.insert_one(a: 1)
       end
 
       it 'runs the command again while using the same read preference and caches the resume token' do
@@ -497,7 +497,7 @@ describe Mongo::Collection::View::ChangeStream do
         end
 
         let(:session) do
-          authorized_client.start_session
+          client.start_session
         end
 
         before do
@@ -576,7 +576,7 @@ describe Mongo::Collection::View::ChangeStream do
         end
 
         let(:session) do
-          authorized_client.start_session
+          client.start_session
         end
 
         before do
@@ -601,9 +601,9 @@ describe Mongo::Collection::View::ChangeStream do
 
         before do
           change_stream
-          authorized_collection.insert_one(a: 1)
+          collection.insert_one(a: 1)
           enum.next
-          authorized_collection.insert_one(a: 2)
+          collection.insert_one(a: 2)
           expect(cursor).to receive(:get_more).once.and_raise(error)
           expect(cursor).to receive(:kill_cursors).and_call_original
           expect(Mongo::Operation::Aggregate).to receive(:new).and_call_original
@@ -629,7 +629,7 @@ describe Mongo::Collection::View::ChangeStream do
           end
 
           let(:session) do
-            authorized_client.start_session
+            client.start_session
           end
 
           before do
@@ -685,9 +685,9 @@ describe Mongo::Collection::View::ChangeStream do
 
       before do
         change_stream
-        authorized_collection.insert_one(a: 1)
+        collection.insert_one(a: 1)
         enum.next
-        authorized_collection.insert_one(a: 2)
+        collection.insert_one(a: 2)
         expect(cursor).to receive(:get_more).and_raise(Mongo::Error::MissingResumeToken)
         expect(cursor).to receive(:kill_cursors).and_call_original
         expect(Mongo::Operation::Aggregate).not_to receive(:new)
@@ -710,7 +710,7 @@ describe Mongo::Collection::View::ChangeStream do
         end
 
         let(:session) do
-          authorized_client.start_session
+          client.start_session
         end
 
         before do

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

@@ -192,7 +192,7 @@ describe Mongo::Collection::View::Readable do
 
       let(:command) do
         operation
-        EventSubscriber.started_events.find { |cmd| cmd.command_name == 'mapreduce' }.command
+        EventSubscriber.started_events.find { |cmd| cmd.command_name == 'mapReduce' }.command
       end
 
       it_behaves_like 'an operation supporting causally consistent reads'

data/spec/mongo/collection/view_spec.rb

@@ -141,7 +141,9 @@ describe Mongo::Collection::View do
 
       before do
         view.to_enum.next
-        cursor.instance_variable_set(:@cursor_id, 1) unless find_command_enabled?
+        if ClusterConfig.instance.fcv_ish < '3.2'
+          cursor.instance_variable_set(:@cursor_id, 1)
+        end
       end
 
       it 'sends a kill cursors command for the cursor' do

data/spec/mongo/cursor_spec.rb

@@ -110,13 +110,13 @@ describe Mongo::Cursor do
           before do
             expect(cursor).to receive(:get_more_operation).and_return(op).ordered
             expect(op).to receive(:execute).and_raise(Mongo::Error::SocketError).ordered
-            expect(cursor).to receive(:get_more_operation).and_call_original.ordered
           end
 
-          it 'iterates the documents' do
-            cursor.each do |doc|
-              expect(doc).to have_key('field')
-            end
+          it 'raises the error' do
+            expect do
+              cursor.each do |doc|
+              end
+            end.to raise_error(Mongo::Error::SocketError)
           end
         end