mongo 1.6.1 → 1.6.2

data/test/pool_test.rb

@@ -12,12 +12,10 @@ class PoolTest < Test::Unit::TestCase
     @pool = Pool.new(@connection, TEST_HOST, TEST_PORT, :size => 5)
 
     @threads    = []
-    @sockets    = []
 
     10.times do
       @threads << Thread.new do
         original_socket = @pool.checkout
-        @sockets << original_socket
         @pool.checkin(original_socket)
         5000.times do
           socket = @pool.checkout

data/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

data/test/replica_sets/complex_connect_test.rb

@@ -1,5 +1,4 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'logger'
 require './test/replica_sets/rs_test_helper'
 
 class ComplexConnectTest < Test::Unit::TestCase
@@ -14,11 +13,13 @@ 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([@rs.host, @rs.ports[2]], [@rs.host, @rs.ports[1]],
-      [@rs.host, @rs.ports[0]], :logger => logger)
+    @conn = ReplSetConnection.new([
+      "#{@rs.host}:#{@rs.ports[2]}",
+      "#{@rs.host}:#{@rs.ports[1]}",
+      "#{@rs.host}:#{@rs.ports[0]}",
+    ])
 
     @conn['test']['foo'].insert({:a => 1})
     assert @conn['test']['foo'].find_one

data/test/replica_sets/connect_test.rb

@@ -14,7 +14,9 @@ class ConnectTest < Test::Unit::TestCase
   # TODO: test connect timeout.
 
   def test_connect_with_deprecated_multi
-    @conn = Connection.multi([[@rs.host, @rs.ports[0]], [@rs.host, @rs.ports[1]]], :name => @rs.name)
+    silently do
+      @conn = Connection.multi([[@rs.host, @rs.ports[0]], [@rs.host, @rs.ports[1]]], :name => @rs.name)
+    end
     assert @conn.is_a?(ReplSetConnection)
     assert @conn.connected?
   end
@@ -26,7 +28,7 @@ class ConnectTest < Test::Unit::TestCase
   end
 
   def test_connect_with_primary_node_killed
-    node = @rs.kill_primary
+    @rs.kill_primary
 
     # Becuase we're killing the primary and trying to connect right away,
     # this is going to fail right away.
@@ -41,7 +43,7 @@ class ConnectTest < Test::Unit::TestCase
   end
 
   def test_connect_with_secondary_node_killed
-    node = @rs.kill_secondary
+    @rs.kill_secondary
 
     rescue_connection_failure do
       @conn = ReplSetConnection.new build_seeds(3)
@@ -97,7 +99,9 @@ class ConnectTest < Test::Unit::TestCase
   end
 
   def test_connect_with_connection_string
-    @conn = Connection.from_uri("mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name}")
+    silently do
+      @conn = Connection.from_uri("mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name}")
+    end
     assert @conn.is_a?(ReplSetConnection)
     assert @conn.connected?
   end
@@ -108,12 +112,16 @@ 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
 
   def test_connect_with_full_connection_string
-    @conn = Connection.from_uri("mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name};safe=true;w=2;fsync=true;slaveok=true")
+    silently do
+      @conn = Connection.from_uri("mongodb://#{@rs.host}:#{@rs.ports[0]},#{@rs.host}:#{@rs.ports[1]}?replicaset=#{@rs.name};safe=true;w=2;fsync=true;slaveok=true")
+    end
     assert @conn.is_a?(ReplSetConnection)
     assert @conn.connected?
     assert_equal 2, @conn.safe[:w]

data/test/replica_sets/pooled_insert_test.rb

@@ -7,7 +7,7 @@ class ReplicaSetPooledInsertTest < Test::Unit::TestCase
 
   def setup
     ensure_rs
-    @conn = ReplSetConnection.new(build_seeds(3), :pool_size => 10, :timeout => 5, :refresh_mode => false)
+    @conn = ReplSetConnection.new(build_seeds(3), :pool_size => 10, :pool_timeout => 5, :refresh_mode => false)
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")

data/test/replica_sets/query_test.rb

@@ -26,7 +26,7 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
       assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
     end
 
-    puts "Benchmark before failover: #{benchmark_queries}"
+    #puts "Benchmark before failover: #{benchmark_queries}"
 
     @rs.kill_primary
 
@@ -37,7 +37,7 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
         assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
       end
 
-    puts "Benchmark after failover: #{benchmark_queries}"
+    #puts "Benchmark after failover: #{benchmark_queries}"
     end
   end
 

data/test/replica_sets/read_preference_test.rb

@@ -87,7 +87,7 @@ class ReadPreferenceTest < Test::Unit::TestCase
 
     results = []
     rescue_connection_failure do
-      puts "@coll.find().each"
+      #puts "@coll.find().each"
       @coll.find.each {|r| results << r}
       [20, 30, 40].each do |a|
         assert results.any? {|r| r['a'] == a}, "Could not find record for a => #{a}"
@@ -105,7 +105,6 @@ class ReadPreferenceTest < Test::Unit::TestCase
     @rs.kill_primary
     assert_equal 2, @coll.find.to_a.length
     rescue_connection_failure do
-      puts "@coll.save()"
       @coll.save({:a => 50}, :safe => {:w => 2, :wtimeout => 10000})
     end
     @rs.restart_killed_nodes

data/test/replica_sets/refresh_test.rb

@@ -10,9 +10,10 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
 
   def teardown
     @rs.restart_killed_nodes
-    @conn.close if @conn
+    @conn.close if defined?(@conn)
   end
 
+=begin
   def test_connect_speed
     Benchmark.bm do |x|
       x.report("Connect") do
@@ -31,6 +32,7 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
       end
     end
   end
+=end
 
   def test_connect_and_manual_refresh_with_secondaries_down
     @rs.kill_all_secondaries
@@ -95,7 +97,7 @@ class ReplicaSetRefreshTest < Test::Unit::TestCase
     num_secondaries = @conn.secondary_pools.length
     old_refresh_version = @conn.refresh_version
 
-    n = @rs.kill_secondary
+    @rs.kill_secondary
     sleep(4)
     @conn['foo']['bar'].find_one
 

data/test/replica_sets/refresh_with_threads_test.rb

@@ -10,11 +10,13 @@ class ReplicaSetRefreshWithThreadsTest < Test::Unit::TestCase
   end
 
   def teardown
-    @rs.restart_killed_nodes
     @conn.close if @conn
   end
 
   def test_read_write_load_with_added_nodes
+    # MongoDB < 2.0 will disconnect clients on rs.reconfig()
+    return true if @rs.version.first < 2
+
     seeds = build_seeds(3)
     args = {
       :refresh_interval => 5,
@@ -45,18 +47,10 @@ 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
-      @rs.add_node
-      threads.each {|t| t.join }
-    end
-
-    config = @conn['admin'].command({:ismaster => 1})
+    @rs.add_node
+    threads.each {|t| t.join }
+    
+    @conn['admin'].command({:ismaster => 1})
 
     assert_equal 3, @conn.secondary_pools.length
     assert_equal 3, @conn.secondaries.length

data/test/replica_sets/rs_test_helper.rb

@@ -21,7 +21,7 @@ class Test::Unit::TestCase
     begin
       yield
     rescue Mongo::ConnectionFailure => ex
-      puts "Rescue attempt #{retries}: from #{ex}"
+      #puts "Rescue attempt #{retries}: from #{ex}"
       retries += 1
       raise ex if retries > max_retries
       sleep(2)

data/test/test_helper.rb

@@ -7,8 +7,11 @@ require 'test/unit'
 def silently
   warn_level = $VERBOSE
   $VERBOSE = nil
-  result = yield
-  $VERBOSE = warn_level
+  begin
+    result = yield
+  ensure
+    $VERBOSE = warn_level
+  end
   result
 end
 
@@ -25,7 +28,6 @@ You can install them as follows:
   gem install mocha
 
 MSG
-
   exit
 end
 
@@ -88,7 +90,7 @@ class Test::Unit::TestCase
   end
 
   def new_mock_db
-    db = Object.new
+    Object.new
   end
 
   def assert_raise_error(klass, message)

data/test/threading/threading_with_large_pool_test.rb

@@ -6,7 +6,7 @@ class TestThreadingLargePool < Test::Unit::TestCase
 
   include Mongo
 
-  @@db = standard_connection(:pool_size => 50, :timeout => 60).db(MONGO_TEST_DB)
+  @@db = standard_connection(:pool_size => 50, :pool_timeout => 60).db(MONGO_TEST_DB)
   @@coll = @@db.collection('thread-test-collection')
 
   def set_up_safe_data

data/test/threading_test.rb

@@ -4,7 +4,7 @@ class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@con = standard_connection(:pool_size => 10, :timeout => 30)
+  @@con = standard_connection(:pool_size => 10, :pool_timeout => 30)
   @@db  = @@con[MONGO_TEST_DB]
   @@coll = @@db.collection('thread-test-collection')
 
@@ -73,7 +73,7 @@ class TestThreading < Test::Unit::TestCase
     @@coll = @@db.collection('thread-test-collection')
 
     1000.times do |i|
-      @@coll.insert("x" => i)
+      @@coll.insert("x" => i, :safe => true)
     end
 
     threads = []

data/test/timeout_test.rb

@@ -0,0 +1,40 @@
+require './test/test_helper'
+
+class TestTimeout < Test::Unit::TestCase
+  def test_op_timeout
+    connection = standard_connection(:op_timeout => 2)
+    
+    admin = connection.db('admin')
+
+    command = BSON::OrderedHash.new
+    command[:sleep] = 1
+    command[:secs] = 1
+    # Should not timeout
+    assert admin.command(command)
+   
+    # Should timeout
+    command[:secs] = 3
+    assert_raise Mongo::OperationTimeout do
+      admin.command(command) 
+    end
+
+  end
+=begin
+  def test_ssl_op_timeout
+    connection = standard_connection(:op_timeout => 1, :ssl => true)
+    
+    coll = connection.db(MONGO_TEST_DB).collection("test")
+    coll.insert({:a => 1})
+   
+    # Should not timeout
+    assert coll.find_one({"$where" => "sleep(100); return true;"})
+
+    # Should timeout 
+    assert_raise Mongo::OperationTimeout do
+      coll.find_one({"$where" => "sleep(5 * 1000); return true;"})
+    end
+
+    coll.remove
+  end
+=end
+end

data/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
@@ -131,6 +131,7 @@ class ReplSetManager
     @mongods[n]['start'] += " --dur" if @durable
     @mongods[n]['start'] += " --smallfiles" if @smallfiles
     @mongods[n]['start'] += " --noprealloc" unless @prealloc
+    @mongods[n]['start'] += "> /dev/null 2>/dev/null"
     @mongods[n]['start']
   end
 
@@ -185,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
@@ -195,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
@@ -260,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})
@@ -293,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
@@ -335,7 +336,7 @@ class ReplSetManager
   private
 
   def initiate
-    puts "Initiating replica set..."
+    #puts "Initiating replica set..."
     con = get_connection
 
     attempt do

data/test/unit/connection_test.rb

@@ -41,6 +41,12 @@ class ConnectionTest < Test::Unit::TestCase
       end
 
       context "given a replica set" do
+        #should "enforce a minimum refresh_interval" do
+        #  @conn = ReplSetConnection.new(['localhost:27017'],
+        #    :connect => false, :refresh_mode => :sync, :refresh_interval => 10)
+        #  assert_equal 60, @conn.refresh_interval
+        #end
+
         should "warn if invalid options are specified" do
           conn = ReplSetConnection.allocate
           opts = {:connect => false}
@@ -81,13 +87,6 @@ class ConnectionTest < Test::Unit::TestCase
         assert_equal({:w => 2, :wtimeout => 1000, :fsync => true, :j => true}, @conn.safe)
       end
 
-      should "have wtimeoutMS take precidence over the depricated wtimeout" do
-        host_name = "localhost"
-        opts = "safe=true&wtimeout=100&wtimeoutMS=500"
-        @conn = Connection.from_uri("mongodb://#{host_name}/foo?#{opts}", :connect => false)
-        assert_equal({:wtimeout => 500}, @conn.safe)
-      end
-
       should "set timeout options on connection" do
         host_name = "localhost"
         opts = "connectTimeoutMS=1000&socketTimeoutMS=5000"

data/test/unit/node_test.rb

@@ -15,6 +15,7 @@ class NodeTest < Test::Unit::TestCase
     admin_db = new_mock_db
     admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1})
     @connection.stubs(:[]).with('admin').returns(admin_db)
+    @connection.stubs(:op_timeout).returns(nil)
     @connection.stubs(:connect_timeout).returns(nil)
     @connection.expects(:log)
 

data/test/unit/pool_manager_test.rb

@@ -10,7 +10,8 @@ class PoolManagerTest < Test::Unit::TestCase
       @db = new_mock_db
 
       @connection = stub("Connection")
-      @connection.stubs(:connect_timeout).returns(5000)
+      @connection.stubs(:connect_timeout).returns(5)
+      @connection.stubs(:op_timeout).returns(5)
       @connection.stubs(:pool_size).returns(2)
       @connection.stubs(:pool_timeout).returns(100)
       @connection.stubs(:seeds).returns(['localhost:30000'])

data/test/uri_test.rb

@@ -78,10 +78,9 @@ class URITest < Test::Unit::TestCase
   end
 
   def test_opts_safe
-    parser = Mongo::URIParser.new('mongodb://localhost:27018?safe=true;w=2;journal=true;wtimeout=200;fsync=true;wtimeoutMS=200')
+    parser = Mongo::URIParser.new('mongodb://localhost:27018?safe=true;w=2;journal=true;fsync=true;wtimeoutMS=200')
     assert parser.safe
     assert_equal 2, parser.w
-    assert_equal 200, parser.wtimeout
     assert parser.fsync
     assert parser.journal
     assert_equal 200, parser.wtimeoutms