minor: replica set test tweaks

Author: TylerBrock

test/replica_sets/basic_test.rb

@@ -47,21 +47,18 @@ def test_accessors
     seeds = build_seeds(3)
     args = {:name => @rs.name}
     @conn = ReplSetConnection.new(seeds, args)
-    @major_version = @rs.version.first
 
     assert_equal @conn.host, @rs.primary[0]
     assert_equal @conn.port, @rs.primary[1]
     assert_equal @conn.host, @conn.primary_pool.host
     assert_equal @conn.port, @conn.primary_pool.port
-    #assert_equal @conn.nodes.sort, @conn.seeds.sort
     assert_equal 2, @conn.secondaries.length
     assert_equal 0, @conn.arbiters.length
     assert_equal 2, @conn.secondary_pools.length
     assert_equal @rs.name, @conn.replica_set_name
     assert @conn.secondary_pools.include?(@conn.read_pool(:secondary))
     assert_equal 90, @conn.refresh_interval
     assert_equal @conn.refresh_mode, false
-    #assert_equal 5, @conn.tag_map.keys.length unless @major_version < 2
   end
 
   context "Socket pools" do

test/replica_sets/complex_read_preference_test.rb

@@ -27,6 +27,8 @@ def test_primary_with_tags
   end
 
   def test_tags
+    return true if @rs.version < "2.1"
+
     assert_read_pool(:primary, {}, 0)
     assert_read_pool(:primary_preferred, {}, 0)
     assert_read_pool(:secondary, {}, [1,2])
@@ -82,6 +84,8 @@ def test_tags
   end
 
   def test_tag_sets
+    return true if @rs.version < "2.1"
+
     # Test primary_preferred overrides any tags when primary is available
     assert_read_pool(:primary_preferred, [
       {"dc" => "sf"}
@@ -177,6 +181,8 @@ def test_nearest
   end
 
   def test_tags_and_nearest
+    return true if @rs.version < "2.1"
+
     # Test connection's read pool matches tags
     assert_read_pool(:secondary_preferred, {"dc" => "sf"}, 2, [100,110,130])
 

test/replica_sets/read_preference_test.rb

@@ -98,6 +98,7 @@ def test_read_routing_with_primary_down
 
     # Restore set
     @rs.restart_killed_nodes
+    sleep(1)
     @repl_cons.each { |con| con.refresh }
     sleep(1)
     @primary_direct = Connection.new(
@@ -134,6 +135,7 @@ def test_read_routing_with_secondary_down
 
     # Restore set
     @rs.restart_killed_nodes
+    sleep(1)
     @repl_cons.each { |con| con.refresh }
     sleep(1)
     @secondary_direct = Connection.new(

test/replica_sets/refresh_with_threads_test.rb

@@ -15,7 +15,7 @@ def teardown
 
   def test_read_write_load_with_added_nodes
     # MongoDB < 2.0 will disconnect clients on rs.reconfig()
-    return true if @rs.version.first < 2
+    return true if @rs.version < "2"
 
     seeds = build_seeds(3)
     args = {

test/tools/repl_set_manager.rb

@@ -42,7 +42,7 @@ def initialize(opts={})
     @mongods   = {}
     version_string = `#{@mongod} --version`
     version_string =~ /(\d\.\d\.\d)/
-    @version = $1.split(".").map {|d| d.to_i }
+    @version = $1
   end
 
   def start_set
@@ -54,7 +54,7 @@ def start_set
     n = 0
     (@primary_count + @secondary_count).times do
       init_node(n, should_start) do |attrs|
-        if @version[0] >= 2
+        if @version >= "2"
           attrs['tags'] = @tags[n % @tags.size]
         end
       end
@@ -114,7 +114,7 @@ def init_node(n, should_start=true)
   end
 
   def journal_switch
-    if @version[0] >= 2
+    if @version >= "2"
       if @durable
         "--journal"
       else