mongo 1.3.1 → 1.4.0

data/test/connection_test.rb

@@ -13,7 +13,7 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def teardown
-    @conn[MONGO_TEST_DB].get_last_error
+    @conn.close
   end
 
   def test_connection_failure
@@ -22,6 +22,20 @@ class TestConnection < Test::Unit::TestCase
     end
   end
 
+ # def test_connection_timeout
+ #   passed = false
+ #   begin
+ #     t0 = Time.now
+ #     Mongo::Connection.new('foo.bar', 27017, :connect_timeout => 3)
+ #   rescue OperationTimeout
+ #     passed = true
+ #     t1 = Time.now
+ #   end
+
+ #   assert passed
+ #   assert t1 - t0 < 4
+ # end
+
   def test_host_port_accessors
     assert_equal @conn.host, TEST_HOST
     assert_equal @conn.port, TEST_PORT
@@ -147,8 +161,8 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_nodes
-    db = Connection.multi([['foo', 27017], ['bar', 27018]], :connect => false)
-    nodes = db.nodes
+    conn = Connection.multi([['foo', 27017], ['bar', 27018]], :connect => false)
+    nodes = conn.nodes
     assert_equal 2, nodes.length
     assert_equal ['foo', 27017], nodes[0]
     assert_equal ['bar', 27018], nodes[1]
@@ -176,35 +190,32 @@ class TestConnection < Test::Unit::TestCase
   end
 
   def test_max_bson_size_value
+    conn = standard_connection(:connect => false)
+
+    admin_db = Object.new
+    admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1, 'maxBsonObjectSize' => 15_000_000})
+    conn.expects(:[]).with('admin').returns(admin_db)
+    conn.connect
+    assert_equal 15_000_000, conn.max_bson_size
+
     conn = standard_connection
     if conn.server_version > "1.7.2"
       assert_equal conn['admin'].command({:ismaster => 1})['maxBsonObjectSize'], conn.max_bson_size
     end
 
     conn.connect
-    assert_equal BSON::BSON_CODER.max_bson_size, conn.max_bson_size
-    doc = {'n' => 'a' * (BSON_CODER.max_bson_size - 11)}
+    doc = {'n' => 'a' * (conn.max_bson_size)}
     assert_raise InvalidDocument do
-      assert BSON::BSON_CODER.serialize(doc)
-    end
-
-    limit = 7 * 1024 * 1024
-    conn.stubs(:max_bson_size).returns(limit)
-    conn.connect
-    assert_equal limit, conn.max_bson_size
-    assert_equal limit, BSON::BSON_CODER.max_bson_size
-    doc = {'n' => 'a' * ((limit) - 11)}
-    assert_raise_error InvalidDocument, "limited to #{limit}" do
-      assert BSON::BSON_CODER.serialize(doc)
+      assert BSON::BSON_CODER.serialize(doc, false, true, @conn.max_bson_size)
     end
   end
 
-  def test_max_bson_size_with_old_mongod
+  def test_max_bson_size_with_no_reported_max_size
     conn = standard_connection(:connect => false)
 
     admin_db = Object.new
-    admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1}).twice
-    conn.expects(:[]).with('admin').returns(admin_db).twice
+    admin_db.expects(:command).returns({'ok' => 1, 'ismaster' => 1})
+    conn.expects(:[]).with('admin').returns(admin_db)
 
     conn.connect
     assert_equal Mongo::DEFAULT_MAX_BSON_SIZE, BSON::BSON_CODER.max_bson_size
@@ -238,6 +249,10 @@ class TestConnection < Test::Unit::TestCase
       @conn.add_auth(@auth['db_name'], @auth['username'], @auth['password'])
     end
 
+    teardown do
+      @conn.clear_auths
+    end
+
     should "save the authentication" do
       assert_equal @auth, @conn.auths[0]
     end
@@ -300,7 +315,7 @@ class TestConnection < Test::Unit::TestCase
       fake_socket = Mocha::Mock.new
       fake_socket.stubs(:close).raises(IOError.new)
       fake_socket.stub_everything
-      TCPSocket.expects(:new).returns(fake_socket)
+      TCPSocket.stubs(:new).returns(fake_socket)
 
       @con.primary_pool.checkout_new_socket
       assert_equal [], @con.primary_pool.close

data/test/cursor_test.rb

@@ -2,8 +2,8 @@ require './test/test_helper'
 require 'logger'
 
 class CursorTest < Test::Unit::TestCase
-
   include Mongo
+  include Mongo::Constants
 
   @@connection = standard_connection
   @@db   = @@connection.db(MONGO_TEST_DB)
@@ -16,11 +16,72 @@ class CursorTest < Test::Unit::TestCase
     @@coll_full_name = "#{MONGO_TEST_DB}.test"
   end
 
+  def test_alive
+    batch = []
+    5000.times do |n|
+      batch << {:a => n}
+    end
+
+    @@coll.insert(batch)
+    cursor = @@coll.find
+    assert !cursor.alive?
+    cursor.next
+    assert cursor.alive?
+    cursor.close
+    assert !cursor.alive?
+    @@coll.remove
+  end
+
+  def test_add_and_remove_options
+    c = @@coll.find
+    assert_equal 0, c.options & OP_QUERY_EXHAUST
+    c.add_option(OP_QUERY_EXHAUST)
+    assert_equal OP_QUERY_EXHAUST, c.options & OP_QUERY_EXHAUST
+    c.remove_option(OP_QUERY_EXHAUST)
+    assert_equal 0, c.options & OP_QUERY_EXHAUST
+
+    c.next
+    assert_raise Mongo::InvalidOperation do
+      c.add_option(OP_QUERY_EXHAUST)
+    end
+
+    assert_raise Mongo::InvalidOperation do
+      c.add_option(OP_QUERY_EXHAUST)
+    end
+  end
+
+  def test_exhaust
+    if @@version >= "2.0"
+      @@coll.remove
+      data = "1" * 100_000
+      10_000.times do |n|
+        @@coll.insert({:n => n, :data => data})
+      end
+
+      c = Cursor.new(@@coll)
+      c.add_option(OP_QUERY_EXHAUST)
+      assert_equal @@coll.count, c.to_a.size
+      assert c.closed?
+
+      c = Cursor.new(@@coll)
+      c.add_option(OP_QUERY_EXHAUST)
+      9999.times do
+        c.next
+      end
+      assert c.has_next?
+      assert c.next
+      assert !c.has_next?
+      assert c.closed?
+
+      @@coll.remove
+    end
+  end
+
   def test_inspect
     selector = {:a => 1}
     cursor = @@coll.find(selector)
     assert_equal "<Mongo::Cursor:0x#{cursor.object_id.to_s(16)} namespace='#{@@db.name}.#{@@coll.name}' " +
-        "@selector=#{selector.inspect}>", cursor.inspect
+        "@selector=#{selector.inspect} @cursor_id=#{cursor.cursor_id}>", cursor.inspect
   end
 
   def test_explain

data/test/db_test.rb

@@ -156,7 +156,8 @@ class DBTest < Test::Unit::TestCase
     assert Mongo::Connection.from_uri("mongodb://spongebob:squarepants@#{host_port}/#{@@db.name}")
 
     assert_raise Mongo::AuthenticationError do
-      Mongo::Connection.from_uri("mongodb://wrong:info@#{host_port}/#{@@db.name}")
+      con = Mongo::Connection.from_uri("mongodb://wrong:info@#{host_port}/#{@@db.name}")
+      con['test']['foo'].find_one
     end
   end
 
@@ -205,8 +206,17 @@ class DBTest < Test::Unit::TestCase
 
   def test_check_command_response
     command = {:forceerror => 1}
-    assert_raise OperationFailure do 
+    raised = false
+    begin
       @@db.command(command)
+    rescue => ex
+      raised = true
+      assert ex.message.include?("forced error"),
+        "error message does not contain 'forced error'"
+      assert_equal 10038, ex.error_code
+      assert_equal 10038, ex.result['assertionCode']
+    ensure
+      assert raised, "No assertion raised!"
     end
   end
 

data/test/pool_test.rb

@@ -0,0 +1,21 @@
+require './test/test_helper'
+require 'logger'
+require 'stringio'
+require 'thread'
+
+class TestPool < Test::Unit::TestCase
+
+  include Mongo
+  include BSON
+
+  def setup
+    @conn = standard_connection
+  end
+
+  def teardown
+    @conn[MONGO_TEST_DB].get_last_error
+  end
+
+  def test_foo
+  end
+end

data/test/replica_sets/connect_test.rb

@@ -6,12 +6,9 @@ require './test/replica_sets/rs_test_helper'
 class ConnectTest < Test::Unit::TestCase
   include Mongo
 
-  def setup
-    RS.restart_killed_nodes
-  end
-
   def teardown
     RS.restart_killed_nodes
+    @conn.close if defined?(@conn) && @conn
   end
 
   def test_connect_with_deprecated_multi
@@ -22,17 +19,30 @@ class ConnectTest < Test::Unit::TestCase
 
   def test_connect_bad_name
     assert_raise_error(ReplicaSetConnectionError, "-wrong") do
-      ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
-        [RS.host, RS.ports[2]], :rs_name => RS.name + "-wrong")
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]], :name => RS.name + "-wrong")
     end
   end
 
+ # def test_connect_timeout
+ #   passed = false
+ #   timeout = 3
+ #   begin
+ #     t0 = Time.now
+ #     @conn = ReplSetConnection.new(['192.169.169.1', 27017], :connect_timeout => timeout)
+ #   rescue OperationTimeout
+ #     passed = true
+ #     t1 = Time.now
+ #   end
+
+ #   assert passed
+ #   assert t1 - t0 < timeout + 1
+ # end
+
   def test_connect
     @conn = ReplSetConnection.new([RS.host, RS.ports[1]], [RS.host, RS.ports[0]],
       [RS.host, RS.ports[2]], :name => RS.name)
     assert @conn.connected?
-    assert @conn.read_primary?
-    assert @conn.primary?
 
     assert_equal RS.primary, @conn.primary
     assert_equal RS.secondaries.sort, @conn.secondaries.sort
@@ -66,22 +76,25 @@ class ConnectTest < Test::Unit::TestCase
       @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_secondary_node_killed
     node = RS.kill_secondary
 
-    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
-      [RS.host, RS.ports[2]])
+    rescue_connection_failure 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_third_node_killed
     RS.kill(RS.get_node_from_port(RS.ports[2]))
 
-    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
-      [RS.host, RS.ports[2]])
+    rescue_connection_failure do
+      @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
+        [RS.host, RS.ports[2]])
+    end
     assert @conn.connected?
   end
 

data/test/replica_sets/connection_string_test.rb

@@ -6,12 +6,9 @@ require './test/replica_sets/rs_test_helper'
 class ConnectionStringTest < Test::Unit::TestCase
   include Mongo
 
-  def setup
-    RS.restart_killed_nodes
-  end
-
   def teardown
     RS.restart_killed_nodes
+    @conn.close if @conn
   end
 
   def test_connect_with_connection_string

data/test/replica_sets/count_test.rb

@@ -15,6 +15,7 @@ class ReplicaSetCountTest < Test::Unit::TestCase
 
   def teardown
     RS.restart_killed_nodes
+    @conn.close if @conn
   end
 
   def test_correct_count_after_insertion_reconnect

data/test/replica_sets/insert_test.rb

@@ -15,6 +15,7 @@ class ReplicaSetInsertTest < Test::Unit::TestCase
 
   def teardown
     RS.restart_killed_nodes
+    @conn.close if @conn
   end
 
   def test_insert

data/test/replica_sets/pooled_insert_test.rb

@@ -8,7 +8,7 @@ class ReplicaSetPooledInsertTest < Test::Unit::TestCase
 
   def setup
     @conn = ReplSetConnection.new([RS.host, RS.ports[0]], [RS.host, RS.ports[1]],
-      [RS.host, RS.ports[2]], :pool_size => 10, :timeout => 5)
+      [RS.host, RS.ports[2]], :pool_size => 5, :timeout => 5)
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")
@@ -16,6 +16,7 @@ class ReplicaSetPooledInsertTest < Test::Unit::TestCase
 
   def teardown
     RS.restart_killed_nodes
+    @conn.close if @conn
   end
 
   def test_insert
@@ -33,6 +34,8 @@ class ReplicaSetPooledInsertTest < Test::Unit::TestCase
       end
     end
 
+    threads.each {|t| t.join}
+
     # Restart the old master and wait for sync
     RS.restart_killed_nodes
     sleep(1)

data/test/replica_sets/query_secondaries.rb

@@ -7,13 +7,14 @@ class ReplicaSetQuerySecondariesTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], :read_secondary => true)
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0]], :read => :secondary)
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
   end
 
   def teardown
     RS.restart_killed_nodes
+    @conn.close if @conn
   end
 
   def test_read_primary

data/test/replica_sets/query_test.rb

@@ -7,7 +7,7 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @conn = ReplSetConnection.new([RS.host, RS.ports[0]])
+    @conn = ReplSetConnection.new([RS.host, RS.ports[0], RS.ports[1]])
     @db = @conn.db(MONGO_TEST_DB)
     @db.drop_collection("test-sets")
     @coll = @db.collection("test-sets")
@@ -15,6 +15,7 @@ class ReplicaSetQueryTest < Test::Unit::TestCase
 
   def teardown
     RS.restart_killed_nodes
+    @conn.close if @conn
   end
 
   def test_query

data/test/replica_sets/read_preference_test.rb

@@ -0,0 +1,43 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require './test/replica_sets/rs_test_helper'
+
+# TODO: enable this once we enable reads from tags.
+class ReadPreferenceTest < Test::Unit::TestCase
+  include Mongo
+
+  #def setup
+  #  @conn = ReplSetConnection.new([RS.host, RS.ports[0], RS.host, RS.ports[1]], :read => :secondary, :pool_size => 50)
+  #  @db = @conn.db(MONGO_TEST_DB)
+  #  @db.drop_collection("test-sets")
+  #end
+
+  # TODO: enable this once we enable reads from tags.
+  # def test_query_tagged
+  #   col = @db['mongo-test']
+
+  #   col.insert({:a => 1}, :safe => {:w => 3})
+  #   col.find_one({}, :read => {:db => "main"})
+  #   col.find_one({}, :read => {:dc => "ny"})
+  #   col.find_one({}, :read => {:dc => "sf"})
+
+  #   assert_raise Mongo::NodeWithTagsNotFound do
+  #     col.find_one({}, :read => {:foo => "bar"})
+  #   end
+
+  #   threads = []
+  #   100.times do
+  #     threads << Thread.new do
+  #       col.find_one({}, :read => {:dc => "sf"})
+  #     end
+  #   end
+
+  #   threads.each {|t| t.join }
+
+  #   col.remove
+  # end
+
+  #def teardown
+  #  RS.restart_killed_nodes
+  #end
+
+end