diff --git a/test/connection_test.rb b/test/connection_test.rb index 782a96c..713ae42 100644 --- a/test/connection_test.rb +++ b/test/connection_test.rb @@ -173,8 +173,8 @@ class TestConnection < Test::Unit::TestCase silently do @conn = Connection.multi([['foo', 27017], ['bar', 27018]], :connect => false) end - nodes = @conn.seeds - assert_equal 2, nodes.length + seeds = @conn.seeds + assert_equal 2, seeds.length assert_equal ['foo', 27017], nodes[0] assert_equal ['bar', 27018], nodes[1] end diff --git a/test/replica_sets/basic_test.rb b/test/replica_sets/basic_test.rb index 8e36428..8690dcf 100644 --- a/test/replica_sets/basic_test.rb +++ b/test/replica_sets/basic_test.rb @@ -43,7 +43,7 @@ class BasicTest < Test::Unit::TestCase 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 @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 diff --git a/test/replica_sets/complex_connect_test.rb b/test/replica_sets/complex_connect_test.rb index b893fb7..e418e9e 100644 --- a/test/replica_sets/complex_connect_test.rb +++ b/test/replica_sets/complex_connect_test.rb @@ -13,7 +13,6 @@ class ComplexConnectTest < Test::Unit::TestCase end def test_complex_connect - logger = Logger.new(STDOUT) primary = Connection.new(@rs.host, @rs.ports[0]) @conn = ReplSetConnection.new( diff --git a/test/replica_sets/connect_test.rb b/test/replica_sets/connect_test.rb index 295a815..a0b915e 100644 --- a/test/replica_sets/connect_test.rb +++ b/test/replica_sets/connect_test.rb @@ -110,7 +110,9 @@ class ConnectTest < Test::Unit::TestCase end def test_connect_with_old_seed_format - @conn = ReplSetConnection.new([@rs.host, @rs.ports[0]], [@rs.host, @rs.ports[1]], [@rs.host, @rs.ports[2]]) + silently do + @conn = ReplSetConnection.new([@rs.host, @rs.ports[0]], [@rs.host, @rs.ports[1]], [@rs.host, @rs.ports[2]]) + end assert @conn.connected? end diff --git a/test/replica_sets/refresh_with_threads_test.rb b/test/replica_sets/refresh_with_threads_test.rb index 9cb2b37..6978de9 100644 --- a/test/replica_sets/refresh_with_threads_test.rb +++ b/test/replica_sets/refresh_with_threads_test.rb @@ -45,13 +45,7 @@ class ReplicaSetRefreshWithThreadsTest < Test::Unit::TestCase end end - # MongoDB < 2.0 will disconnect clients on rs.reconfig() - if @rs.version.first < 2 - assert_raise Mongo::ConnectionFailure do - @rs.add_node - threads.each {|t| t.join } - end - else + rescue_connection_failure do @rs.add_node threads.each {|t| t.join } end diff --git a/test/tools/repl_set_manager.rb b/test/tools/repl_set_manager.rb index 4f11be5..b37eec7 100644 --- a/test/tools/repl_set_manager.rb +++ b/test/tools/repl_set_manager.rb @@ -46,10 +46,10 @@ class ReplSetManager end def start_set - system("killall mongod") + system("killall mongod > /dev/null 2>/dev/null") sleep(1) should_start = true - puts "** Starting a replica set with #{@count} nodes" + #puts "** Starting a replica set with #{@count} nodes" n = 0 (@primary_count + @secondary_count).times do @@ -186,7 +186,7 @@ class ReplSetManager puts "waiting for mongod @ pid #{pid} to die..." sleep(1) else - puts "mongod @ pid #{pid} was killed successfully" + #puts "mongod @ pid #{pid} was killed successfully" return true end end @@ -196,7 +196,7 @@ class ReplSetManager def kill(node, signal=2) pid = @mongods[node]['pid'] - puts "** Killing node with pid #{pid} at port #{@mongods[node]['port']}" + #puts "** Killing node with pid #{pid} at port #{@mongods[node]['port']}" system("kill #{pid}") dead = wait_for_death(pid) @mongods[node]['up'] = false if dead @@ -261,10 +261,10 @@ class ReplSetManager alias :restart :start def ensure_up(n=nil, connection=nil) - print "** Ensuring members are up..." + #print "** Ensuring members are up..." attempt(n) do - print "." + #print "." con = connection || get_connection begin status = con['admin'].command({:replSetGetStatus => 1}) @@ -294,7 +294,7 @@ class ReplSetManager end if states.any? {|s| s['ismaster']} - print "all members up!\n\n" + #puts "all members up!" connections.each {|c| c.close } con.close return status @@ -336,7 +336,7 @@ class ReplSetManager private def initiate - puts "Initiating replica set..." + #puts "Initiating replica set..." con = get_connection attempt do