RUBY-1279 Close all clients opened in client spec

Author: estolfo

spec/mongo/client_spec.rb

@@ -2,6 +2,10 @@
 
 describe Mongo::Client do
 
+  after do
+    begin; client.close; rescue; end
+  end
+
   describe '#==' do
 
     let(:client) do
@@ -12,12 +16,12 @@
       )
     end
 
-    after do
-      client.close
-    end
-
     context 'when the other is a client' do
 
+      after do
+        other.close
+      end
+
       context 'when the options and cluster are equal' do
 
         let(:other) do
@@ -105,6 +109,10 @@
 
     context 'when the other is a client' do
 
+      after do
+        other.close
+      end
+
       context 'when the options and cluster are equal' do
 
         let(:other) do
@@ -228,10 +236,6 @@
           described_class.new([default_address.seed], authorized_client.options.merge(options))
         end
 
-        after do
-          client.close
-        end
-
         it 'sets the option' do
           expect(client.options['retry_writes']).to eq(options[:retry_writes])
         end
@@ -243,10 +247,6 @@
           described_class.new([default_address.seed], authorized_client.options.merge(options))
         end
 
-        after do
-          client.close
-        end
-
         context 'when the compressor is supported' do
 
           let(:options) do
@@ -456,10 +456,6 @@
           authorized_client.with(logger: logger)
         end
 
-        after do
-          client.close
-        end
-
         it 'does not use the global logger' do
           expect(client.cluster.logger).to_not eq(Mongo::Logger.logger)
         end
@@ -1373,10 +1369,6 @@
         client.list_databases({}, true)
       end
 
-      after do
-        client.close
-      end
-
       it 'sends the command with the nameOnly flag set to true' do
         expect(command[:nameOnly]).to be(true)
       end
@@ -1429,7 +1421,8 @@
     end
 
     before do
-      expect(client.cluster).to receive(:disconnect!).and_call_original
+      # note that disconnect! is called also in the after block
+      expect(client.cluster).to receive(:disconnect!).twice.and_call_original
     end
 
     it 'disconnects the cluster and returns true' do