mongo 2.5.0.beta → 2.5.0

data/spec/mongo/command_monitoring_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-def skippable?(file)
-  !write_command_enabled? && (file.include?('bulkWrite') || file.include?('insert'))
-end
-
 def ignore?(test)
   if version = test.ignore_if_server_version_greater_than
     return true if version == "3.0" && find_command_enabled?
@@ -18,43 +14,41 @@ describe 'Command Monitoring Events' do
 
   COMMAND_MONITORING_TESTS.each do |file|
 
-    if !skippable?(file)
 
-      spec = Mongo::CommandMonitoring::Spec.new(file)
+    spec = Mongo::CommandMonitoring::Spec.new(file)
 
-      spec.tests.each do |test|
+    spec.tests.each do |test|
 
-        context(test.description) do
+      context(test.description) do
 
-          let(:subscriber) do
-            Mongo::CommandMonitoring::TestSubscriber.new
-          end
+        let(:subscriber) do
+          Mongo::CommandMonitoring::TestSubscriber.new
+        end
 
-          let(:monitoring) do
-            authorized_client.instance_variable_get(:@monitoring)
-          end
+        let(:monitoring) do
+          authorized_client.instance_variable_get(:@monitoring)
+        end
 
-          before do
-            authorized_collection.find.delete_many
-            authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
-          end
+        before do
+          authorized_collection.find.delete_many
+          authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+        end
 
-          after do
-            monitoring.subscribers[Mongo::Monitoring::COMMAND].delete(subscriber)
-            authorized_collection.find.delete_many
-          end
+        after do
+          monitoring.subscribers[Mongo::Monitoring::COMMAND].delete(subscriber)
+          authorized_collection.find.delete_many
+        end
 
-          test.expectations.each do |expectation|
+        test.expectations.each do |expectation|
 
-            it "generates a #{expectation.event_name} for #{expectation.command_name}", unless: ignore?(test) do
-              begin
-                test.run(authorized_collection)
-                event = subscriber.send(expectation.event_type)[expectation.command_name]
-                expect(event).to send(expectation.matcher, expectation)
-              rescue Mongo::Error::OperationFailure, Mongo::Error::BulkWriteError
-                event = subscriber.send(expectation.event_type)[expectation.command_name]
-                expect(event).to send(expectation.matcher, expectation)
-              end
+          it "generates a #{expectation.event_name} for #{expectation.command_name}", unless: ignore?(test) do
+            begin
+              test.run(authorized_collection)
+              event = subscriber.send(expectation.event_type)[expectation.command_name]
+              expect(event).to send(expectation.matcher, expectation)
+            rescue Mongo::Error::OperationFailure, Mongo::Error::BulkWriteError
+              event = subscriber.send(expectation.event_type)[expectation.command_name]
+              expect(event).to send(expectation.matcher, expectation)
             end
           end
         end

data/spec/mongo/crud_spec.rb

@@ -13,7 +13,7 @@ describe 'CRUD' do
         context(test.description) do
 
           before(:each) do
-            authorized_collection.delete_many
+            test.setup_test(authorized_collection)
           end
 
           after(:each) do

data/spec/mongo/cursor_spec.rb

@@ -267,9 +267,8 @@ describe Mongo::Cursor do
         authorized_client.cluster.instance_variable_get(:@cursor_reaper)
       end
 
-
-      it 'schedules a kill cursors op' do
-        sleep(Mongo::Cluster::CursorReaper::FREQUENCY + 0.5)
+      it 'schedules a kill cursors op', unless: sessions_enabled? do
+        sleep(Mongo::Cluster::PeriodicExecutor::FREQUENCY)
         expect {
           cursor.to_a
         }.to raise_exception(Mongo::Error::OperationFailure)

data/spec/mongo/database_spec.rb

@@ -208,7 +208,7 @@ describe Mongo::Database do
         described_class.new(authorized_client, 'invalid_database')
       end
 
-      it 'returns an empty list', if: write_command_enabled? do
+      it 'returns an empty list' do
         expect(database.collections).to be_empty
       end
     end
@@ -241,22 +241,44 @@ describe Mongo::Database do
       expect(database.command({:ismaster => 1}.freeze).written_count).to eq(0)
     end
 
-    context 'when provided a session' do
+    context 'when provided a session', if: sessions_enabled? do
 
       let(:operation) do
-        database.command({ :ismaster => 1 }, session: session)
+        client.database.command({ :ismaster => 1 }, session: session)
       end
 
       let(:failed_operation) do
-        database.command({ :invalid => 1 }, session: session)
+        client.database.command({ :invalid => 1 }, session: session)
+      end
+
+      let(:session) do
+        client.start_session
       end
 
       let(:client) do
-        authorized_client
+        authorized_client.with(heartbeat_frequency: 100).tap do |cl|
+          cl.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+        end
+      end
+
+      let(:subscriber) do
+        EventSubscriber.new
       end
 
       it_behaves_like 'an operation using a session'
       it_behaves_like 'a failed operation using a session'
+
+
+      let(:full_command) do
+        subscriber.started_events.find { |cmd| cmd.command_name == :ismaster }.command
+      end
+
+      it 'does not add a afterClusterTime field' do
+        # Ensure that the session has an operation time
+        client.database.command({ ping: 1 }, session: session)
+        operation
+        expect(full_command['readConcern']).to be_nil
+      end
     end
 
     context 'when a read concern is provided', if: find_command_enabled? do
@@ -396,7 +418,7 @@ describe Mongo::Database do
         described_class.new(authorized_client.with(client_options), TEST_DB)
       end
 
-      context 'when a write concern is not in the command selector', if: write_command_enabled? do
+      context 'when a write concern is not in the command selector' do
 
         let(:cmd) do
           {
@@ -410,7 +432,7 @@ describe Mongo::Database do
         end
       end
 
-      context 'when a write concern is provided in the command selector', if: write_command_enabled? && standalone? do
+      context 'when a write concern is provided in the command selector', if: standalone? do
 
         let(:cmd) do
           {
@@ -435,16 +457,10 @@ describe Mongo::Database do
       described_class.new(authorized_client, TEST_DB)
     end
 
-    it 'drops the database', if: write_command_enabled? do
+    it 'drops the database' do
       expect(database.drop).to be_successful
     end
 
-    it 'raises an exception', if: (!write_command_enabled? && auth_enabled?) do
-      expect {
-        database.drop
-      }.to raise_error(Mongo::Error::OperationFailure)
-    end
-
     context 'when provided a session' do
 
       let(:operation) do

data/spec/mongo/dns_seedlist_discovery_spec.rb

@@ -0,0 +1,94 @@
+require 'spec_helper'
+
+describe 'DNS Seedlist Discovery' do
+  include Mongo::ConnectionString
+
+  before(:all) do
+
+    module Mongo
+      class Server
+        # The constructor keeps the same API, but does not instantiate a
+        # monitor and run it.
+        alias :original_initialize :initialize
+
+        def initialize(address, cluster, monitoring, event_listeners, options = {})
+          @address = address
+          @cluster = cluster
+          @monitoring = monitoring
+          @options = options.freeze
+          @monitor = Monitor.new(address, event_listeners, options)
+        end
+
+        # Disconnect simply needs to return true since we have no monitor and
+        # no connection.
+        alias :original_disconnect! :disconnect!
+
+        def disconnect!;
+          true;
+        end
+      end
+    end
+  end
+
+  after(:all) do
+
+    module Mongo
+      class Server
+        alias :initialize :original_initialize
+        remove_method(:original_initialize)
+
+        alias :disconnect! :original_disconnect!
+        remove_method(:original_disconnect!)
+      end
+    end
+  end
+
+  DNS_SEEDLIST_DISCOVERY_TESTS.each do |file_name|
+
+    file = File.new(file_name)
+    spec = YAML.load(ERB.new(file.read).result)
+    file.close
+
+    test = Mongo::ConnectionString::Test.new(spec)
+
+    context(File.basename(file_name)) do
+
+      context 'when the uri is invalid', if: test.raise_error? do
+
+        let(:valid_errors) do
+          [
+            Mongo::Error::InvalidTXTRecord,
+            Mongo::Error::NoSRVRecords,
+            Mongo::Error::InvalidURI,
+            Mongo::Error::MismatchedDomain,
+          ]
+        end
+
+        let(:error) do
+          e = nil
+          begin; test.uri; rescue => ex; e = ex; end
+          e
+        end
+
+        it 'raises an error' do
+          expect(valid_errors).to include(error.class)
+        end
+      end
+
+      context 'when the uri is valid', unless: test.raise_error? do
+
+        it 'does not raise an exception' do
+          expect(test.uri).to be_a(Mongo::URI::SRVProtocol)
+        end
+
+        it 'creates a client with the correct hosts' do
+          expect(test.client).to have_hosts(test)
+        end
+
+        it 'creates a client with the correct options' do
+          expect(test.client).to match_options(test)
+        end
+      end
+    end
+  end
+end

data/spec/mongo/grid/fs_bucket_spec.rb

@@ -339,7 +339,7 @@ describe Mongo::Grid::FSBucket do
       end
     end
 
-    context 'when the index creation encounters an error', if: write_command_enabled? do
+    context 'when the index creation encounters an error' do
 
       before do
         fs.chunks_collection.drop

data/spec/mongo/grid/stream/write_spec.rb

@@ -275,7 +275,7 @@ describe Mongo::Grid::FSBucket::Stream::Write do
         end
       end
 
-      context 'when the index creation encounters an error', if: write_command_enabled? do
+      context 'when the index creation encounters an error' do
 
         before do
           fs.chunks_collection.drop

data/spec/mongo/index/view_spec.rb

@@ -347,18 +347,8 @@ describe Mongo::Index::View do
 
           context 'when the server does not accept writeConcern for the createIndexes operation', unless: collation_enabled? do
 
-            context 'when the server supports the createIndexes command', if: write_command_enabled? do
-
-              it 'does not apply the write concern' do
-                expect(result).to be_successful
-              end
-            end
-
-            context 'when the driver inserts into the system.indexes collection', unless: write_command_enabled? do
-
-              it 'does not apply the write concern' do
-                expect(result).to be_successful
-              end
+            it 'does not apply the write concern' do
+              expect(result).to be_successful
             end
           end
         end
@@ -502,18 +492,8 @@ describe Mongo::Index::View do
 
           context 'when the server does not accept writeConcern for the createIndexes operation', unless: collation_enabled? do
 
-            context 'when the server accepts the createIndexes command', if: write_command_enabled? do
-
-              it 'does not apply the write concern' do
-                expect(result).to be_successful
-              end
-            end
-
-            context 'when the driver inserts into the system.indexes collection', unless: write_command_enabled? do
-
-              it 'does not apply the write concern' do
-                expect(result).to be_successful
-              end
+            it 'does not apply the write concern' do
+              expect(result).to be_successful
             end
           end
         end
@@ -533,15 +513,11 @@ describe Mongo::Index::View do
           view.drop_one('name_1')
         end
 
-        it 'raises an exception', if: write_command_enabled? do
+        it 'raises an exception' do
           expect {
             view.create_many([{ key: { name: 1 }, unique: false }])
           }.to raise_error(Mongo::Error::OperationFailure)
         end
-
-        it 'does not raise an exception', unless: write_command_enabled? do
-          expect(view.create_many([{ key: { name: 1 }, unique: false }])).to be_successful
-        end
       end
     end
   end
@@ -613,18 +589,8 @@ describe Mongo::Index::View do
 
         context 'when the server does not accept writeConcern for the createIndexes operation', unless: collation_enabled? do
 
-          context 'when the server supports the createIndexes command', if: write_command_enabled? do
-
-            it 'does not apply the write concern' do
-              expect(result).to be_successful
-            end
-          end
-
-          context 'when the driver inserts into the system.indexes collection', unless: write_command_enabled? do
-
-            it 'does not apply the write concern' do
-              expect(result).to be_successful
-            end
+          it 'does not apply the write concern' do
+            expect(result).to be_successful
           end
         end
       end
@@ -667,15 +633,11 @@ describe Mongo::Index::View do
         view.drop_one('name_1')
       end
 
-      it 'raises an exception', if: write_command_enabled? do
+      it 'raises an exception' do
         expect {
           view.create_one(spec, unique: false)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
-
-      it 'does not raise an exception', unless: write_command_enabled? do
-        expect(view.create_one(spec, unique: false)).to be_successful
-      end
     end
 
     context 'when providing an index name' do

data/spec/mongo/operation/write/bulk/delete_spec.rb

@@ -125,7 +125,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
     context 'when the deletes are ordered' do
 
       let(:documents) do
-        [ failing_delete_doc,
+        [ { q: { '$set' => { a: 1 } }, limit: 0 },
           { 'q' => { field: 'test' }, 'limit' => 1 }
         ]
       end
@@ -174,7 +174,7 @@ describe Mongo::Operation::Write::Bulk::Delete do
     context 'when the deletes are unordered' do
 
       let(:documents) do
-        [ failing_delete_doc,
+        [ { q: { '$set' => { a: 1 } }, limit: 0 },
           { 'q' => { field: 'test' }, 'limit' => 1 }
         ]
       end

data/spec/mongo/operation/write/bulk/insert_spec.rb

@@ -119,13 +119,9 @@ describe Mongo::Operation::Write::Bulk::Insert do
           op.execute(authorized_primary)
         end
 
-        it 'inserts the documents into the database', if: write_command_enabled? do
+        it 'inserts the documents into the database' do
           expect(response.written_count).to eq(1)
         end
-
-        it 'inserts the documents into the database', unless: write_command_enabled? do
-          expect(response.written_count).to eq(0)
-        end
       end
     end
 
@@ -141,13 +137,9 @@ describe Mongo::Operation::Write::Bulk::Insert do
           op.execute(authorized_primary)
         end
 
-        it 'inserts the documents into the database', if: write_command_enabled? do
+        it 'inserts the documents into the database' do
           expect(response.written_count).to eq(2)
         end
-
-        it 'inserts the documents into the database', unless: write_command_enabled? do
-          expect(response.written_count).to eq(0)
-        end
       end
     end