Merge pull request #580 from estolfo/jenkins

Changes to test suite for testing on Jenkins with Mongo Orchestration

Author: estolfo

lib/mongo/operation/map_reduce.rb

@@ -63,7 +63,7 @@ class MapReduce
       #
       # @since 2.0.0
       def execute(context)
-        unless context.standalone? || context.primary? || secondary_ok?
+        unless context.standalone? || context.mongos? || context.primary? || secondary_ok?
           raise Error::NeedPrimaryServer.new(ERROR_MESSAGE)
         end
         execute_message(context)

lib/mongo/operation/read/list_collections.rb

@@ -49,9 +49,6 @@ class ListCollections
         #
         # @since 2.0.0
         def execute(context)
-          unless context.primary? || context.standalone?
-            raise Exception, "Must use primary server"
-          end
           execute_message(context)
         end
 

lib/mongo/operation/read/list_indexes.rb

@@ -51,9 +51,6 @@ class ListIndexes
         #
         # @since 2.0.0
         def execute(context)
-          unless context.primary? || context.standalone?
-            raise Exception, "Must use primary server"
-          end
           execute_message(context)
         end
 

spec/mongo/auth/cr_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Auth::CR do
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
   let(:server) do

spec/mongo/auth/ldap_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Auth::LDAP do
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
   let(:server) do

spec/mongo/auth/scram_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Auth::SCRAM do
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
   let(:server) do

spec/mongo/auth/x509_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Auth::X509 do
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
   let(:server) do

spec/mongo/database_spec.rb

@@ -133,7 +133,7 @@
       pending 'raises an exception' # 2.6
     end
 
-    context 'when the user is not authorized' do
+    context 'when the user is not authorized', unless: sharded? do
 
       let(:database) do
         described_class.new(unauthorized_client, TEST_DB)
@@ -177,7 +177,7 @@
         described_class.new(client, TEST_DB, client.options)
       end
 
-      it 'uses that read preference' do
+      it 'uses that read preference', unless: sharded? do
         expect do
           database.command({ ping: 1 }, { read: read })
         end.to raise_error(Mongo::ServerSelector::NoServerAvailable)

spec/mongo/server/connection_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Server::Connection do
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
   let(:server) do

spec/mongo/server/monitor_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Server::Monitor do
 
   let(:address) do
-    Mongo::Address.new('127.0.0.1:27017')
+    Mongo::Address.new(DEFAULT_ADDRESS)
   end
 
   let(:listeners) do
@@ -22,9 +22,17 @@
         monitor.scan!
       end
 
-      it 'updates the server description' do
+      it 'updates the server description', if: standalone? do
         expect(monitor.description).to be_standalone
       end
+
+      it 'updates the server description', if: replica_set? do
+        expect(monitor.description).to be_primary
+      end
+
+      it 'updates the server description', if: sharded? do
+        expect(monitor.description).to be_mongos
+      end
     end
 
     context 'when the ismaster command fails' do
@@ -51,7 +59,7 @@
       context 'when the socket gets an exception' do
 
         let(:bad_address) do
-          Mongo::Address.new('127.0.0.1:27017')
+          Mongo::Address.new(DEFAULT_ADDRESS)
         end
 
         let(:monitor) do