mongo 1.8.6 → 1.12.5

data/test/replica_set/client_test.rb

@@ -1,6 +1,20 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
-class ClientTest < Test::Unit::TestCase
+class ReplicaSetClientTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
@@ -12,7 +26,7 @@ class ClientTest < Test::Unit::TestCase
   end
 
   def test_reconnection
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
     assert @client.connected?
 
     manager = @client.local_manager
@@ -26,6 +40,21 @@ class ClientTest < Test::Unit::TestCase
     assert_equal @client.local_manager, manager
   end
 
+  def test_reconnect_method
+    @client = MongoReplicaSetClient.from_uri(@uri, :op_timeout => TEST_OP_TIMEOUT)
+    assert @client.connected?
+
+    manager = @client.local_manager
+
+    @client.close
+    assert !@client.connected?
+    assert !@client.local_manager
+
+    @client.reconnect
+    assert @client.connected?
+    assert_equal @client.local_manager, manager
+  end
+
   # TODO: test connect timeout.
 
   def test_connect_with_deprecated_multi
@@ -62,122 +91,163 @@ class ClientTest < Test::Unit::TestCase
   end
 
   def test_connect_with_primary_stepped_down
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
-    @client[MONGO_TEST_DB]['bar'].save({:a => 1}, {:w => 3})
-    assert @client[MONGO_TEST_DB]['bar'].find_one
+    @client = MongoReplicaSetClient.from_uri(@uri)
+    @client[TEST_DB]['bar'].save({:a => 1}, {:w => 3})
+    assert @client[TEST_DB]['bar'].find_one
 
     primary = Mongo::MongoClient.new(*@client.primary)
+    authenticate_client(primary)
     assert_raise Mongo::ConnectionFailure do
-      primary['admin'].command(step_down_command)
+      perform_step_down(primary)
     end
     assert @client.connected?
 
     rescue_connection_failure do
-      @client[MONGO_TEST_DB]['bar'].find_one
+      @client[TEST_DB]['bar'].find_one
     end
-    @client[MONGO_TEST_DB]['bar'].find_one
+    @client[TEST_DB]['bar'].find_one
   end
 
   def test_connect_with_primary_killed
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     assert @client.connected?
-    @client[MONGO_TEST_DB]['bar'].save({:a => 1}, {:w => 3})
-    assert @client[MONGO_TEST_DB]['bar'].find_one
+    @client[TEST_DB]['bar'].save({:a => 1}, {:w => 3})
+    assert @client[TEST_DB]['bar'].find_one
 
     @rs.primary.kill(Signal.list['KILL'])
 
     sleep(3)
 
     rescue_connection_failure do
-      @client[MONGO_TEST_DB]['bar'].find_one
+      @client[TEST_DB]['bar'].find_one
     end
-    @client[MONGO_TEST_DB]['bar'].find_one
+    @client[TEST_DB]['bar'].find_one
   end
 
   def test_save_with_primary_stepped_down
-    @client = MongoReplicaSetClient.new @rs.repl_set_seeds
+    @client = MongoReplicaSetClient.from_uri(@uri)
     assert @client.connected?
 
     primary = Mongo::MongoClient.new(*@client.primary)
+    authenticate_client(primary)
     assert_raise Mongo::ConnectionFailure do
-      primary['admin'].command(step_down_command)
+      perform_step_down(primary)
     end
 
     rescue_connection_failure do
-      @client[MONGO_TEST_DB]['bar'].save({:a => 1}, {:w => 2})
+      @client[TEST_DB]['bar'].save({:a => 1}, {:w => 2})
+    end
+    @client[TEST_DB]['bar'].find_one
+  end
+
+  # def test_connect_with_first_node_removed
+  #   @client = MongoReplicaSetClient.from_uri(@uri)
+  #   @client[TEST_DB]['bar'].save({:a => 1}, {:w => 3})
+
+  #   # Make sure everyone's views of optimes are caught up
+  #   loop do
+  #     break if @rs.repl_set_get_status.all? do |status|
+  #       members = status['members']
+  #       primary_optime = members.find{|m| m['state'] == 1}['optime'].seconds
+  #       members.any?{|m| m['state'] == 2 && primary_optime - m['optime'].seconds < 5}
+  #     end
+  #     sleep 1
+  #   end
+
+  #   old_primary = [@client.primary_pool.host, @client.primary_pool.port]
+  #   old_primary_conn = Mongo::MongoClient.new(*old_primary)
+
+  #   assert_raise Mongo::ConnectionFailure do
+  #     perform_step_down(old_primary_conn)
+  #   end
+
+  #   # Wait for new primary
+  #   rescue_connection_failure do
+  #     sleep 1 until @rs.primary
+  #   end
+
+  #   new_primary = [@rs.primary.host, @rs.primary.port]
+  #   new_primary_conn = Mongo::MongoClient.new(*new_primary)
+
+  #   assert new_primary != old_primary
+
+  #   config = nil
+
+  #   # Remove old primary from replset
+  #   rescue_connection_failure do
+  #     config = @client['local']['system.replset'].find_one
+  #   end
+
+  #   old_member = config['members'].select {|m| m['host'] == old_primary.join(':')}.first
+  #   config['members'].reject! {|m| m['host'] == old_primary.join(':')}
+  #   config['version'] += 1
+
+  #   begin
+  #     new_primary_conn['admin'].command({'replSetReconfig' => config})
+  #   rescue Mongo::ConnectionFailure
+  #   end
+
+  #   # Wait for the dust to settle
+  #   rescue_connection_failure do
+  #     assert @client[TEST_DB]['bar'].find_one
+  #   end
+
+  #   begin
+  #     # Make sure a new connection skips the old primary
+  #     @new_conn = MongoReplicaSetClient.new @rs.repl_set_seeds
+  #     @new_conn.connect
+  #     new_nodes = @new_conn.secondaries + [@new_conn.primary]
+  #     assert !new_nodes.include?(old_primary)
+  #   ensure
+  #     # Add the old primary back
+  #     config['members'] << old_member
+  #     config['version'] += 1
+
+  #     begin
+  #       new_primary_conn['admin'].command({'replSetReconfig' => config})
+  #     rescue Mongo::ConnectionFailure
+  #     end
+  #   end
+  # end
+
+  def test_connect_with_hung_first_node
+    hung_node = nil
+    begin
+      hung_node = IO.popen('nc -lk 127.0.0.1 29999 >/dev/null 2>&1')
+
+      Timeout.timeout(3) do
+        @client = MongoReplicaSetClient.new(['localhost:29999'] + @rs.repl_set_seeds,
+          :connect_timeout => 2)
+        @client.connect
+      end
+      assert ['localhost:29999'] != @client.primary
+      assert !@client.secondaries.include?('localhost:29999')
+    ensure
+      begin
+        Process.kill("KILL", hung_node.pid) if hung_node
+      rescue
+        # the process ended, was killed already, or the system doesn't support nc
+      end
+    end
+  end
+
+  def test_read_pref_primary_with_tags
+    parser = Mongo::URIParser.new("mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}" +
+                                    "?replicaset=#{@rs.repl_set_name}&readPreference=primary&" +
+                                    "readPreferenceTags=dc:ny,rack:1")
+    assert_raise_error Mongo::MongoArgumentError do
+      parser.connection.read_pool
     end
-    @client[MONGO_TEST_DB]['bar'].find_one
   end
 
-  #def test_connect_with_first_node_removed
-  #  @client = MongoReplicaSetClient.new @rs.repl_set_seeds
-  #  @client[MONGO_TEST_DB]['bar'].save({:a => 1}, {:w => 3})
-  #
-  #  old_primary = [@client.primary_pool.host, @client.primary_pool.port]
-  #  old_primary_conn = Mongo::MongoClient.new(*old_primary)
-  #  assert_raise Mongo::ConnectionFailure do
-  #    old_primary_conn['admin'].command(step_down_command)
-  #  end
-  #
-  #  # Wait for new primary
-  #  rescue_connection_failure do
-  #    sleep 1 until @rs.get_node_with_state(1)
-  #  end
-  #
-  #  new_primary = @rs.get_all_host_pairs_with_state(1).first
-  #  new_primary_conn = Mongo::MongoClient.new(*new_primary)
-  #
-  #  config = nil
-  #
-  #  # Remove old primary from replset
-  #  rescue_connection_failure do
-  #    config = @client['local']['system.replset'].find_one
-  #  end
-  #
-  #  old_member = config['members'].select {|m| m['host'] == old_primary.join(':')}.first
-  #  config['members'].reject! {|m| m['host'] == old_primary.join(':')}
-  #  config['version'] += 1
-  #
-  #  begin
-  #    new_primary_conn['admin'].command({'replSetReconfig' => config})
-  #  rescue Mongo::ConnectionFailure
-  #  end
-  #
-  #  # Wait for the dust to settle
-  #  rescue_connection_failure do
-  #    assert @client[MONGO_TEST_DB]['bar'].find_one
-  #  end
-  #
-  #  # Make sure a new connection skips the old primary
-  #  @new_conn = MongoReplicaSetClient.new @rs.repl_set_seeds
-  #  @new_conn.connect
-  #  new_nodes = [@new_conn.primary] + @new_conn.secondaries
-  #  assert !(new_nodes).include?(old_primary)
-  #
-  #  # Add the old primary back
-  #  config['members'] << old_member
-  #  config['version'] += 1
-  #
-  #  begin
-  #    new_primary_conn['admin'].command({'replSetReconfig' => config})
-  #  rescue Mongo::ConnectionFailure
-  #  end
-  #end
-
-  #def test_connect_with_hung_first_node
-  #  hung_node = nil
-  #  begin
-  #    hung_node = IO.popen('nc -lk 127.0.0.1 29999 >/dev/null 2>&1')
-  #
-  #    @client = MongoReplicaSetClient.new(['localhost:29999'] + @rs.repl_set_seeds,
-  #                                  :connect_timeout => 2)
-  #    @client.connect
-  #    assert ['localhost:29999'] != @client.primary
-  #    assert !@client.secondaries.include?('localhost:29999')
-  #  ensure
-  #    Process.kill("KILL", hung_node.pid) if hung_node
-  #  end
-  #end
+  def test_read_pref_with_tags
+    parser = Mongo::URIParser.new("mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}" +
+                                    "?replicaset=#{@rs.repl_set_name}&" +
+                                    "readPreferenceTags=dc:ny,rack:1")
+    assert_raise_error Mongo::MongoArgumentError do
+      parser.connection.read_pool
+    end
+  end
 
   def test_connect_with_connection_string
     @client = MongoClient.from_uri("mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name}")
@@ -186,29 +256,33 @@ class ClientTest < Test::Unit::TestCase
   end
 
   def test_connect_with_connection_string_in_env_var
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name}"
-    @client = MongoReplicaSetClient.new
-    assert !@client.nil?
-    assert_equal 2, @client.seeds.length
-    assert_equal @rs.replicas[0].host, @client.seeds[0][0]
-    assert_equal @rs.replicas[1].host, @client.seeds[1][0]
-    assert_equal @rs.replicas[0].port, @client.seeds[0][1]
-    assert_equal @rs.replicas[1].port, @client.seeds[1][1]
-    assert_equal @rs.repl_set_name, @client.replica_set_name
-    assert @client.connected?
+    uri = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name}"
+    with_preserved_env_uri(uri) do
+      @client = MongoReplicaSetClient.new
+      assert !@client.nil?
+      assert_equal 2, @client.seeds.length
+      assert_equal @rs.replicas[0].host, @client.seeds[0][0]
+      assert_equal @rs.replicas[1].host, @client.seeds[1][0]
+      assert_equal @rs.replicas[0].port, @client.seeds[0][1]
+      assert_equal @rs.replicas[1].port, @client.seeds[1][1]
+      assert_equal @rs.repl_set_name, @client.replica_set_name
+      assert @client.connected?
+    end
   end
 
   def test_connect_with_connection_string_in_implicit_mongodb_uri
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name}"
-    @client = MongoClient.from_uri
-    assert !@client.nil?
-    assert_equal 2, @client.seeds.length
-    assert_equal @rs.replicas[0].host, @client.seeds[0][0]
-    assert_equal @rs.replicas[1].host, @client.seeds[1][0]
-    assert_equal @rs.replicas[0].port, @client.seeds[0][1]
-    assert_equal @rs.replicas[1].port, @client.seeds[1][1]
-    assert_equal @rs.repl_set_name, @client.replica_set_name
-    assert @client.connected?
+    uri = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name}"
+    with_preserved_env_uri(uri) do
+      @client = MongoClient.from_uri
+      assert !@client.nil?
+      assert_equal 2, @client.seeds.length
+      assert_equal @rs.replicas[0].host, @client.seeds[0][0]
+      assert_equal @rs.replicas[1].host, @client.seeds[1][0]
+      assert_equal @rs.replicas[0].port, @client.seeds[0][1]
+      assert_equal @rs.replicas[1].port, @client.seeds[1][1]
+      assert_equal @rs.repl_set_name, @client.replica_set_name
+      assert @client.connected?
+    end
   end
 
   def test_connect_with_new_seed_format
@@ -233,32 +307,87 @@ class ClientTest < Test::Unit::TestCase
   end
 
   def test_connect_with_full_connection_string_in_env_var
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name};w=2;fsync=true;slaveok=true"
-    @client = MongoReplicaSetClient.new
-    assert !@client.nil?
-    assert @client.connected?
-    assert_equal 2, @client.write_concern[:w]
-    assert @client.write_concern[:fsync]
-    assert @client.read_pool
+    uri = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name};w=2;fsync=true;slaveok=true"
+    with_preserved_env_uri(uri) do
+      @client = MongoReplicaSetClient.new
+      assert !@client.nil?
+      assert @client.connected?
+      assert_equal 2, @client.write_concern[:w]
+      assert @client.write_concern[:fsync]
+      assert @client.read_pool
+    end
   end
 
   def test_connect_options_override_env_var
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name};w=2;fsync=true;slaveok=true"
-    @client = MongoReplicaSetClient.new({:w => 0})
-    assert !@client.nil?
-    assert @client.connected?
-    assert_equal 0, @client.write_concern[:w]
+    uri = "mongodb://#{@rs.replicas[0].host_port},#{@rs.replicas[1].host_port}?replicaset=#{@rs.repl_set_name};w=2;fsync=true;slaveok=true"
+    with_preserved_env_uri(uri) do
+      @client = MongoReplicaSetClient.new({:w => 0})
+      assert !@client.nil?
+      assert @client.connected?
+      assert_equal 0, @client.write_concern[:w]
+    end
+  end
+
+  def test_ipv6
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds)
+    with_ipv6_enabled(@client) do
+      assert MongoReplicaSetClient.new(["[::1]:#{@rs.replicas[0].port}"])
+    end
+  end
+
+  def test_ipv6_with_uri
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds)
+    with_ipv6_enabled(@client) do
+      uri = "mongodb://[::1]:#{@rs.replicas[0].port},[::1]:#{@rs.replicas[1].port}"
+      with_preserved_env_uri(uri) do
+        assert MongoReplicaSetClient.new
+      end
+    end
+  end
+
+  def test_ipv6_with_uri_opts
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds)
+    with_ipv6_enabled(@client) do
+      uri = "mongodb://[::1]:#{@rs.replicas[0].port},[::1]:#{@rs.replicas[1].port}/?safe=true;"
+      with_preserved_env_uri(uri) do
+        assert MongoReplicaSetClient.new
+      end
+    end
+  end
+
+  def test_ipv6_with_different_formats
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds)
+    with_ipv6_enabled(@client) do
+      uri = "mongodb://[::1]:#{@rs.replicas[0].port},localhost:#{@rs.replicas[1].port}"
+      with_preserved_env_uri(uri) do
+        assert MongoReplicaSetClient.new
+      end
+    end
   end
 
   def test_find_and_modify_with_secondary_read_preference
-    @client = MongoReplicaSetClient.new
-    collection = @client[MONGO_TEST_DB].collection('test', :read => :secondary)
-    collection << { :a => 1, :processed => false}
+    @client = MongoReplicaSetClient.from_uri(@uri)
+    collection = @client[TEST_DB].collection('test', :read => :secondary)
+    id = BSON::ObjectId.new
+    collection << { :a => id, :processed => false }
 
     collection.find_and_modify(
-      :query => {},
-      :update => {"$set" => {:processed => true}}
+      :query => { 'a' => id },
+      :update => { "$set" => { :processed => true }}
     )
-    assert_equal collection.find_one({}, :fields => {:_id => 0}, :read => :primary), {'a' => 1, 'processed' => true}
+    assert_equal true, collection.find_one({ 'a' => id }, :read => :primary)['processed']
+  end
+
+  def test_op_timeout_option
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :connect => false,
+                                                           :op_timeout => nil)
+    assert_equal nil, client.op_timeout
+
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :connect => false,
+                                                           :op_timeout => 50)
+    assert_equal 50, client.op_timeout
+
+    client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :connect => false)
+    assert_equal Mongo::MongoClient::DEFAULT_OP_TIMEOUT, client.op_timeout
   end
 end

data/test/replica_set/connection_test.rb

@@ -1,6 +1,20 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
-class ConnectionTest < Test::Unit::TestCase
+class ReplicaSetConnectionTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
@@ -45,33 +59,37 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_connect_with_connection_string_in_env_var
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name}"
-    @connection = ReplSetConnection.new
-    assert !@connection.nil?
-    assert_equal 3, @connection.seeds.length
-    assert_equal @rs.replicas[0].host, @connection.seeds[0][0]
-    assert_equal @rs.replicas[1].host, @connection.seeds[1][0]
-    assert_equal @rs.replicas[2].host, @connection.seeds[2][0]
-    assert_equal @rs.replicas[0].port, @connection.seeds[0][1]
-    assert_equal @rs.replicas[1].port, @connection.seeds[1][1]
-    assert_equal @rs.replicas[2].port, @connection.seeds[2][1]
-    assert_equal @rs.repl_set_name, @connection.replica_set_name
-    assert @connection.connected?
+    uri = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name}"
+    with_preserved_env_uri(uri) do
+      @connection = ReplSetConnection.new
+      assert !@connection.nil?
+      assert_equal 3, @connection.seeds.length
+      assert_equal @rs.replicas[0].host, @connection.seeds[0][0]
+      assert_equal @rs.replicas[1].host, @connection.seeds[1][0]
+      assert_equal @rs.replicas[2].host, @connection.seeds[2][0]
+      assert_equal @rs.replicas[0].port, @connection.seeds[0][1]
+      assert_equal @rs.replicas[1].port, @connection.seeds[1][1]
+      assert_equal @rs.replicas[2].port, @connection.seeds[2][1]
+      assert_equal @rs.repl_set_name, @connection.replica_set_name
+      assert @connection.connected?
+    end
   end
 
   def test_connect_with_connection_string_in_implicit_mongodb_uri
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name}"
-    @connection = Connection.from_uri
-    assert !@connection.nil?
-    assert_equal 3, @connection.seeds.length
-    assert_equal @rs.replicas[0].host, @connection.seeds[0][0]
-    assert_equal @rs.replicas[1].host, @connection.seeds[1][0]
-    assert_equal @rs.replicas[2].host, @connection.seeds[2][0]
-    assert_equal @rs.replicas[0].port, @connection.seeds[0][1]
-    assert_equal @rs.replicas[1].port, @connection.seeds[1][1]
-    assert_equal @rs.replicas[2].port, @connection.seeds[2][1]
-    assert_equal @rs.repl_set_name, @connection.replica_set_name
-    assert @connection.connected?
+    uri = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name}"
+    with_preserved_env_uri(uri) do
+      @connection = Connection.from_uri
+      assert !@connection.nil?
+      assert_equal 3, @connection.seeds.length
+      assert_equal @rs.replicas[0].host, @connection.seeds[0][0]
+      assert_equal @rs.replicas[1].host, @connection.seeds[1][0]
+      assert_equal @rs.replicas[2].host, @connection.seeds[2][0]
+      assert_equal @rs.replicas[0].port, @connection.seeds[0][1]
+      assert_equal @rs.replicas[1].port, @connection.seeds[1][1]
+      assert_equal @rs.replicas[2].port, @connection.seeds[2][1]
+      assert_equal @rs.repl_set_name, @connection.replica_set_name
+      assert @connection.connected?
+    end
   end
 
   def test_connect_with_new_seed_format
@@ -96,21 +114,25 @@ class ConnectionTest < Test::Unit::TestCase
   end
 
   def test_connect_with_full_connection_string_in_env_var
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name};safe=true;w=2;fsync=true;slaveok=true"
-    @connection = ReplSetConnection.new
-    assert !@connection.nil?
-    assert @connection.connected?
-    assert_equal 2, @connection.write_concern[:w]
-    assert @connection.write_concern[:fsync]
-    assert @connection.read_pool
+    uri = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name};safe=true;w=2;fsync=true;slaveok=true"
+    with_preserved_env_uri(uri) do
+      @connection = ReplSetConnection.new
+      assert !@connection.nil?
+      assert @connection.connected?
+      assert_equal 2, @connection.write_concern[:w]
+      assert @connection.write_concern[:fsync]
+      assert @connection.read_pool
+    end
   end
 
   def test_connect_options_override_env_var
-    ENV['MONGODB_URI'] = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name};safe=true;w=2;fsync=true;slaveok=true"
-    @connection = ReplSetConnection.new({:safe => {:w => 1}})
-    assert !@connection.nil?
-    assert @connection.connected?
-    assert_equal 1, @connection.write_concern[:w]
+    uri = "mongodb://#{@rs.repl_set_seeds_uri}?replicaset=#{@rs.repl_set_name};safe=true;w=2;fsync=true;slaveok=true"
+    with_preserved_env_uri(uri) do
+      @connection = ReplSetConnection.new({:safe => {:w => 1}})
+      assert !@connection.nil?
+      assert @connection.connected?
+      assert_equal 1, @connection.write_concern[:w]
+    end
   end
 
 end

data/test/replica_set/count_test.rb

@@ -1,13 +1,29 @@
+# Copyright (C) 2009-2013 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class ReplicaSetCountTest < Test::Unit::TestCase
 
   def setup
     ensure_cluster(:rs)
-    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :read => :primary_preferred)
+    @client = MongoReplicaSetClient.new(@rs.repl_set_seeds, :read => :primary_preferred, :op_timeout => TEST_OP_TIMEOUT)
+    authenticate_client(@client)
     assert @client.primary_pool
     @primary = MongoClient.new(@client.primary_pool.host, @client.primary_pool.port)
-    @db = @client.db(MONGO_TEST_DB)
+    authenticate_client(@primary)
+    @db = @client.db(TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")
   end