From 3c127984a333098b7fb5c72690ca695741e5af0d Mon Sep 17 00:00:00 2001
From: Kyle Banker <kylebanker@gmail.com>
Date: Thu, 25 Aug 2011 14:57:24 -0400
Subject: [PATCH] RUBY-242 check BSON size on a per-connection basis.

---
 ext/cbson/bson_buffer.c                     |  11 ++++
 ext/cbson/bson_buffer.h                     |   4 ++
 ext/cbson/cbson.c                           |  13 +++--
 ext/java/jar/jbson.jar                      | Bin 14619 -> 14625 bytes
 ext/java/src/org/jbson/RubyBSONEncoder.java |   3 +-
 lib/bson/bson_c.rb                          |   4 +-
 lib/bson/bson_java.rb                       |   4 +-
 lib/bson/bson_ruby.rb                       |  13 +++--
 lib/bson/byte_buffer.rb                     |   5 +-
 lib/mongo/collection.rb                     |   6 +-
 lib/mongo/connection.rb                     |  13 +++--
 lib/mongo/node.rb                           |   5 +-
 lib/mongo/repl_set_connection.rb            |  11 +++-
 lib/mongo/util/pool_manager.rb              |  32 ++++++-----
 test/collection_test.rb                     |   2 +-
 test/connection_test.rb                     |  41 +++++++-------
 test/db_test.rb                             |   3 +-
 test/unit/connection_test.rb                |   8 +--
 test/unit/node_test.rb                      |   2 +-
 test/unit/repl_set_connection_test.rb       |  59 --------------------
 20 files changed, 108 insertions(+), 131 deletions(-)
 delete mode 100644 test/unit/repl_set_connection_test.rb

diff --git a/ext/cbson/bson_buffer.c b/ext/cbson/bson_buffer.c
index 2ba3902..65ee71a 100644
--- a/ext/cbson/bson_buffer.c
+++ b/ext/cbson/bson_buffer.c
@@ -20,11 +20,13 @@
 #include "bson_buffer.h"
 
 #define INITIAL_BUFFER_SIZE 256
+#define DEFAULT_MAX_SIZE 4 * 1024 * 1024
 
 struct bson_buffer {
     char* buffer;
     int size;
     int position;
+    int max_size;
 };
 
 /* Allocate and return a new buffer.
@@ -43,10 +45,19 @@ bson_buffer_t bson_buffer_new(void) {
         free(buffer);
         return NULL;
     }
+    buffer->max_size = DEFAULT_MAX_SIZE;
 
     return buffer;
 }
 
+void bson_buffer_set_max_size(bson_buffer_t buffer, int max_size) {
+    buffer->max_size = max_size;
+}
+
+int bson_buffer_get_max_size(bson_buffer_t buffer) {
+    return buffer->max_size;
+}
+
 /* Free the memory allocated for `buffer`.
  * Return non-zero on failure. */
 int bson_buffer_free(bson_buffer_t buffer) {
diff --git a/ext/cbson/bson_buffer.h b/ext/cbson/bson_buffer.h
index af36020..1068024 100644
--- a/ext/cbson/bson_buffer.h
+++ b/ext/cbson/bson_buffer.h
@@ -29,6 +29,10 @@ typedef int bson_buffer_position;
  * Return NULL on allocation failure. */
 bson_buffer_t bson_buffer_new(void);
 
+/* Set the max size for this buffer.
+ * Note: this is not a hard limit. */
+void bson_buffer_set_max_size(bson_buffer_t buffer, int max_size);
+
 /* Free the memory allocated for `buffer`.
  * Return non-zero on failure. */
 int bson_buffer_free(bson_buffer_t buffer);
diff --git a/ext/cbson/cbson.c b/ext/cbson/cbson.c
index 2999752..ae46e40 100644
--- a/ext/cbson/cbson.c
+++ b/ext/cbson/cbson.c
@@ -599,17 +599,22 @@ static void write_doc(bson_buffer_t buffer, VALUE hash, VALUE check_keys, VALUE
     length = bson_buffer_get_position(buffer) - start_position;
 
     // make sure that length doesn't exceed 4MB
-    if (length > max_bson_size) {
+    if (length > bson_buffer_get_max_size(buffer)) {
       bson_buffer_free(buffer);
-      rb_raise(InvalidDocument, "Document too large: BSON documents are limited to %d bytes.", max_bson_size);
+      rb_raise(InvalidDocument,
+          "Document too large: This BSON documents is limited to %d bytes.",
+          bson_buffer_get_max_size(buffer));
       return;
     }
     SAFE_WRITE_AT_POS(buffer, length_location, (const char*)&length, 4);
 }
 
-static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys, VALUE move_id) {
+static VALUE method_serialize(VALUE self, VALUE doc, VALUE check_keys,
+    VALUE move_id, VALUE max_size) {
+
     VALUE result;
     bson_buffer_t buffer = bson_buffer_new();
+    bson_buffer_set_max_size(buffer, FIX2INT(max_size));
     if (buffer == NULL) {
         rb_raise(rb_eNoMemError, "failed to allocate memory in buffer.c");
     }
@@ -973,7 +978,7 @@ void Init_cbson() {
     CBson = rb_define_module("CBson");
     ext_version = rb_str_new2(VERSION);
     rb_define_const(CBson, "VERSION", ext_version);
-    rb_define_module_function(CBson, "serialize", method_serialize, 3);
+    rb_define_module_function(CBson, "serialize", method_serialize, 4);
     rb_define_module_function(CBson, "deserialize", method_deserialize, 1);
     rb_define_module_function(CBson, "max_bson_size", method_max_bson_size, 0);
     rb_define_module_function(CBson, "update_max_bson_size", method_update_max_bson_size, 1);
diff --git a/ext/java/jar/jbson.jar b/ext/java/jar/jbson.jar
index 6f204b1bcecbd570c4b43cbc9f4c6ded009a90ac..a929b602b5ade0a5ca74a9ba1de3e5651cadd6d6 100644
GIT binary patch
delta 9356
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

delta 9384
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
L8nhCz|91WdwbRyP

diff --git a/ext/java/src/org/jbson/RubyBSONEncoder.java b/ext/java/src/org/jbson/RubyBSONEncoder.java
index e892ccf..c376959 100644
--- a/ext/java/src/org/jbson/RubyBSONEncoder.java
+++ b/ext/java/src/org/jbson/RubyBSONEncoder.java
@@ -69,7 +69,8 @@ public class RubyBSONEncoder extends BSONEncoder {
     private static final BigInteger LONG_MIN = BigInteger.valueOf(-MAX - 1);
 
 
-    public RubyBSONEncoder(Ruby runtime, boolean check_keys, boolean move_id){
+    public RubyBSONEncoder(Ruby runtime, boolean check_keys, boolean move_id, int max_bson_size){
+      _max_bson_size = max_bson_size;
       _check_keys = check_keys;
       _move_id = move_id;
       _runtime = runtime;
diff --git a/lib/bson/bson_c.rb b/lib/bson/bson_c.rb
index a1bdd33..977b6f7 100644
--- a/lib/bson/bson_c.rb
+++ b/lib/bson/bson_c.rb
@@ -20,8 +20,8 @@
 module BSON
   class BSON_C
 
-    def self.serialize(obj, check_keys=false, move_id=false)
-      ByteBuffer.new(CBson.serialize(obj, check_keys, move_id))
+    def self.serialize(obj, check_keys=false, move_id=false, max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
+      ByteBuffer.new(CBson.serialize(obj, check_keys, move_id, max_bson_size))
     end
 
     def self.deserialize(buf=nil)
diff --git a/lib/bson/bson_java.rb b/lib/bson/bson_java.rb
index 9d2c6f1..7a1eb0d 100644
--- a/lib/bson/bson_java.rb
+++ b/lib/bson/bson_java.rb
@@ -4,9 +4,9 @@ module BSON
 
     # TODO: Pool or cache instances of RubyBSONEncoder so that
     # we don't create a new one on each call to #serialize.
-    def self.serialize(obj, check_keys=false, move_id=false)
+    def self.serialize(obj, check_keys=false, move_id=false, max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
       raise InvalidDocument, "BSON_JAVA.serialize takes a Hash" unless obj.is_a?(Hash)
-      enc = Java::OrgJbson::RubyBSONEncoder.new(JRuby.runtime, check_keys, move_id)
+      enc = Java::OrgJbson::RubyBSONEncoder.new(JRuby.runtime, check_keys, move_id, max_bson_size)
       ByteBuffer.new(enc.encode(obj))
     end
 
diff --git a/lib/bson/bson_ruby.rb b/lib/bson/bson_ruby.rb
index de7bff0..08f96a9 100644
--- a/lib/bson/bson_ruby.rb
+++ b/lib/bson/bson_ruby.rb
@@ -46,8 +46,8 @@ module BSON
     NUMBER_LONG = 18
     MAXKEY = 127
 
-    def initialize
-      @buf = ByteBuffer.new
+    def initialize(max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
+      @buf = ByteBuffer.new('', max_bson_size)
       @encoder = BSON_RUBY
     end
 
@@ -105,8 +105,8 @@ module BSON
 
     # Serializes an object.
     # Implemented to ensure an API compatible with BSON extension.
-    def self.serialize(obj, check_keys=false, move_id=false)
-      new.serialize(obj, check_keys, move_id)
+    def self.serialize(obj, check_keys=false, move_id=false, max_bson_size=BSON::DEFAULT_MAX_BSON_SIZE)
+      new(max_bson_size).serialize(obj, check_keys, move_id)
     end
 
     def self.deserialize(buf=nil)
@@ -137,8 +137,9 @@ module BSON
       end
 
       serialize_eoo_element(@buf)
-      if @buf.size > @@max_bson_size
-        raise InvalidDocument, "Document is too large (#{@buf.size}). BSON documents are limited to #{@@max_bson_size} bytes."
+      if @buf.size > @buf.max_size
+        raise InvalidDocument, "Document is too large (#{@buf.size}). " +
+         "This BSON documents is limited to #{@buf.max_size} bytes."
       end
       @buf.put_int(@buf.size, 0)
       @buf
diff --git a/lib/bson/byte_buffer.rb b/lib/bson/byte_buffer.rb
index 672b84d..2ec4b40 100644
--- a/lib/bson/byte_buffer.rb
+++ b/lib/bson/byte_buffer.rb
@@ -20,9 +20,9 @@
 module BSON
   class ByteBuffer
 
-    attr_reader :order
+    attr_reader :order, :max_size
 
-    def initialize(initial_data="")
+    def initialize(initial_data="", max_size=BSON::DEFAULT_MAX_BSON_SIZE)
       @str = case initial_data
         when String then
           if initial_data.respond_to?(:force_encoding)
@@ -40,6 +40,7 @@ module BSON
       @order  = :little_endian
       @int_pack_order    = 'V'
       @double_pack_order = 'E'
+      @max_size = max_size
     end
 
     if RUBY_VERSION >= '1.9'
diff --git a/lib/mongo/collection.rb b/lib/mongo/collection.rb
index bd4bafb..621bfd5 100644
--- a/lib/mongo/collection.rb
+++ b/lib/mongo/collection.rb
@@ -357,7 +357,7 @@ module Mongo
       message = BSON::ByteBuffer.new("\0\0\0\0")
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{@name}")
       message.put_int(0)
-      message.put_binary(BSON::BSON_CODER.serialize(selector, false, true).to_s)
+      message.put_binary(BSON::BSON_CODER.serialize(selector, false, true, @connection.max_bson_size).to_s)
 
       @connection.instrument(:remove, :database => @db.name, :collection => @name, :selector => selector) do
         if safe
@@ -404,7 +404,7 @@ module Mongo
       update_options += 2 if opts[:multi]
       message.put_int(update_options)
       message.put_binary(BSON::BSON_CODER.serialize(selector, false, true).to_s)
-      message.put_binary(BSON::BSON_CODER.serialize(document, false, true).to_s)
+      message.put_binary(BSON::BSON_CODER.serialize(document, false, true, @connection.max_bson_size).to_s)
 
       @connection.instrument(:update, :database => @db.name, :collection => @name, :selector => selector, :document => document) do
         if safe
@@ -897,7 +897,7 @@ module Mongo
       message = BSON::ByteBuffer.new("\0\0\0\0")
       BSON::BSON_RUBY.serialize_cstr(message, "#{@db.name}.#{collection_name}")
       documents.each do |doc|
-        message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true).to_s)
+        message.put_binary(BSON::BSON_CODER.serialize(doc, check_keys, true, @connection.max_bson_size).to_s)
       end
       raise InvalidOperation, "Exceded maximum insert size of 16,000,000 bytes" if message.size > 16_000_000
 
diff --git a/lib/mongo/connection.rb b/lib/mongo/connection.rb
index c4f3e24..0e4fe61 100644
--- a/lib/mongo/connection.rb
+++ b/lib/mongo/connection.rb
@@ -512,12 +512,11 @@ module Mongo
           @read_primary = false
         end
 
+        @max_bson_size = config['maxBsonObjectSize'] || Mongo::DEFAULT_MAX_BSON_SIZE
         set_primary(@host_to_try)
       end
 
-      if connected?
-        BSON::BSON_CODER.update_max_bson_size(self)
-      else
+      if !connected?
         raise ConnectionFailure, "Failed to connect to a master node at #{@host_to_try[0]}:#{@host_to_try[1]}"
       end
     end
@@ -571,8 +570,7 @@ module Mongo
     #
     # @return [Integer]
     def max_bson_size
-      config = self['admin'].command({:ismaster => 1})
-      config['maxBsonObjectSize'] || Mongo::DEFAULT_MAX_BSON_SIZE
+      @max_bson_size
     end
 
     # Checkout a socket for reading (i.e., a secondary node).
@@ -619,7 +617,7 @@ module Mongo
           @logger.fatal "MONGODB [FATAL] #{msg}"
         else
           @logger.info "MONGODB [INFO] #{msg}"
-        end
+      end
     end
 
     # Execute the block and log the operation described by name
@@ -635,6 +633,9 @@ module Mongo
 
     # Generic initialization code.
     def setup(opts)
+      # Default maximum BSON object size
+      @max_bson_size = Mongo::DEFAULT_MAX_BSON_SIZE
+
       # Authentication objects
       @auths = opts.fetch(:auths, [])
 
diff --git a/lib/mongo/node.rb b/lib/mongo/node.rb
index 8d1f2dd..8439e7d 100644
--- a/lib/mongo/node.rb
+++ b/lib/mongo/node.rb
@@ -8,7 +8,8 @@ module Mongo
       if data.is_a?(String)
         self.host, self.port = split_nodes(data)
       else
-        self.host, self.port = data
+        self.host = data[0]
+        self.port = data[1].nil? ? Connection::DEFAULT_PORT : data[1].to_i
       end
       self.address = "#{host}:#{port}"
     end
@@ -134,7 +135,7 @@ module Mongo
     def split_nodes(host_string)
       data = host_string.split(":")
       host = data[0]
-      port = data[1].to_i || Connection::DEFAULT_PORT
+      port = data[1].nil? ? Connection::DEFAULT_PORT : data[1].to_i
 
       [host, port]
     end
diff --git a/lib/mongo/repl_set_connection.rb b/lib/mongo/repl_set_connection.rb
index d726ca5..f249bd5 100644
--- a/lib/mongo/repl_set_connection.rb
+++ b/lib/mongo/repl_set_connection.rb
@@ -87,8 +87,10 @@ module Mongo
       # The list of seed nodes
       @seeds = args
 
+      @nodes = @seeds.dup
+
       # The members of the replica set, stored as instances of Mongo::Node.
-      @nodes = []
+      @members = []
 
       # Connection pool for primary node
       @primary      = nil
@@ -139,7 +141,6 @@ module Mongo
         manager.connect
 
         update_config(manager)
-        #BSON::BSON_CODER.update_max_bson_size(self)
         initiate_auto_refresh
 
         if @primary.nil? #TODO: in v2.0, we'll let this be optional and do a lazy connect.
@@ -164,6 +165,7 @@ module Mongo
       @manager = manager
       @hosts = manager.hosts
       @nodes = manager.nodes
+      @max_bson_size = manager.max_bson_size
     end
 
     # If ismaster doesn't match our current view
@@ -210,6 +212,11 @@ module Mongo
       super
     end
 
+    def nodes
+      warn "DEPRECATED"
+      @seeds
+    end
+
     # Determine whether we're reading from a primary node. If false,
     # this connection connects to a secondary node and @read_secondaries is true.
     #
diff --git a/lib/mongo/util/pool_manager.rb b/lib/mongo/util/pool_manager.rb
index 68e478a..94ea367 100644
--- a/lib/mongo/util/pool_manager.rb
+++ b/lib/mongo/util/pool_manager.rb
@@ -2,7 +2,7 @@ module Mongo
   class PoolManager
 
     attr_reader :connection, :seeds, :arbiters, :primary, :secondaries,
-      :primary_pool, :read_pool, :secondary_pools, :hosts, :nodes
+      :primary_pool, :read_pool, :secondary_pools, :hosts, :nodes, :max_bson_size
 
     def initialize(connection, seeds)
       @connection = connection
@@ -12,10 +12,10 @@ module Mongo
 
     def connect
       initialize_data
-      nodes = connect_to_members
-      initialize_pools(nodes)
-      update_seed_list(nodes)
-      @nodes = nodes
+      members = connect_to_members
+      initialize_pools(members)
+      update_seed_list(members)
+      @members = members
     end
 
     # Ensure that the view of the replica set is current by
@@ -106,34 +106,34 @@ module Mongo
       @secondaries = []
       @secondary_pools = []
       @hosts = []
-      @nodes = []
+      @members = []
     end
 
     # Connect to each member of the replica set
     # as reported by the given seed node, and return
     # as a list of Mongo::Node objects.
     def connect_to_members
-      nodes = []
+      members = []
 
       seed = get_valid_seed_node
 
       seed.node_list.each do |host|
         node = Mongo::Node.new(self.connection, host)
         if node.connect && node.set_config
-          nodes << node
+          members << node
         end
       end
 
-      if nodes.empty?
+      if members.empty?
         raise ConnectionFailure, "Failed to connect to any given member."
       end
 
-      nodes
+      members
     end
 
     # Initialize the connection pools for the primary and secondary nodes.
-    def initialize_pools(nodes)
-      nodes.each do |member|
+    def initialize_pools(members)
+      members.each do |member|
         @hosts << member.host_string
 
         if member.primary?
@@ -151,7 +151,9 @@ module Mongo
         end
       end
 
-      @arbiters = nodes.first.arbiters
+      @max_bson_size = members.first.config['maxBsonObjectSize'] ||
+        Mongo::DEFAULT_MAX_BSON_SIZE
+      @arbiters = members.first.arbiters
       choose_read_pool
     end
 
@@ -203,8 +205,8 @@ module Mongo
         "#{@seeds.map {|s| "#{s[0]}:#{s[1]}" }.join(', ')}"
     end
 
-    def update_seed_list(nodes)
-      @seeds = nodes.map { |n| n.host_port }
+    def update_seed_list(members)
+      @seeds = members.map { |n| n.host_port }
     end
 
   end
diff --git a/test/collection_test.rb b/test/collection_test.rb
index 0c96ff7..0c91d11 100644
--- a/test/collection_test.rb
+++ b/test/collection_test.rb
@@ -1,7 +1,7 @@
 require './test/test_helper'
 
 class TestCollection < Test::Unit::TestCase
-  @@connection ||= standard_connection(:op_timeout => 2)
+  @@connection ||= standard_connection(:op_timeout => 10)
   @@db   = @@connection.db(MONGO_TEST_DB)
   @@test = @@db.collection("test")
   @@version = @@connection.server_version
diff --git a/test/connection_test.rb b/test/connection_test.rb
index a4f90fe..de2fe70 100644
--- a/test/connection_test.rb
+++ b/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
@@ -162,8 +162,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]
@@ -191,35 +191,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
@@ -253,6 +250,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
@@ -315,7 +316,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
diff --git a/test/db_test.rb b/test/db_test.rb
index 6445e44..2bb9108 100644
--- a/test/db_test.rb
+++ b/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
 
diff --git a/test/unit/connection_test.rb b/test/unit/connection_test.rb
index ebb3068..a7ea223 100644
--- a/test/unit/connection_test.rb
+++ b/test/unit/connection_test.rb
@@ -9,8 +9,8 @@ class ConnectionTest < Test::Unit::TestCase
         TCPSocket.stubs(:new).returns(new_mock_socket)
 
         admin_db = new_mock_db
-        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
       end
 
@@ -52,8 +52,8 @@ class ConnectionTest < Test::Unit::TestCase
         @conn = Connection.from_uri("mongodb://localhost", :connect => false)
 
         admin_db = new_mock_db
-        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
       end
 
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index f623059..627bd24 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -20,7 +20,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal "power.level.com:#{Connection::DEFAULT_PORT}", node.address
   end
 
-  should "load a node from a stirng" do
+  should "load a node from a string" do
     node = Node.new(@connection, 'localhost:1234')
     assert_equal 'localhost', node.host
     assert_equal 1234, node.port
diff --git a/test/unit/repl_set_connection_test.rb b/test/unit/repl_set_connection_test.rb
deleted file mode 100644
index 6290123..0000000
--- a/test/unit/repl_set_connection_test.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-require './test/test_helper'
-include Mongo
-
-class ReplSetConnectionTest < Test::Unit::TestCase
-  context "Initialization: " do
-    context "connecting to a replica set" do
-      setup do
-        TCPSocket.stubs(:new).returns(new_mock_socket('localhost', 27017))
-        @conn = ReplSetConnection.new(['localhost', 27017], :connect => false, :read_secondary => true)
-
-        admin_db = new_mock_db
-        @hosts = ['localhost:27018', 'localhost:27019', 'localhost:27020']
-
-        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts}).
-          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
-          then.returns({'ok' => 1, 'ismaster' => 0, 'hosts' => @hosts, 'secondary' => 1}).
-          then.returns({'ok' => 1, 'ismaster' => 0, 'arbiterOnly' => 1})
-
-        @conn.stubs(:[]).with('admin').returns(admin_db)
-        @conn.connect
-      end
-
-      should "store the hosts returned from the ismaster command" do
-        assert_equal 'localhost', @conn.primary_pool.host
-        assert_equal 27017, @conn.primary_pool.port
-
-        assert_equal 'localhost', @conn.secondary_pools[0].host
-        assert_equal 27018, @conn.secondary_pools[0].port
-
-        assert_equal 'localhost', @conn.secondary_pools[1].host
-        assert_equal 27019, @conn.secondary_pools[1].port
-
-        assert_equal 2, @conn.secondary_pools.length
-      end
-    end
-
-    context "connecting to a replica set and providing seed nodes" do
-      setup do
-        TCPSocket.stubs(:new).returns(new_mock_socket)
-        @conn = ReplSetConnection.new(['localhost', 27017], ['localhost', 27019], :connect => false)
-
-        admin_db = new_mock_db
-        @hosts = ['localhost:27017', 'localhost:27018', 'localhost:27019']
-        admin_db.stubs(:command).returns({'ok' => 1, 'ismaster' => 1, 'hosts' => @hosts})
-        @conn.stubs(:[]).with('admin').returns(admin_db)
-        @conn.connect
-      end
-    end
-
-    context "initializing with a mongodb uri" do
-
-      should "parse a uri specifying multiple nodes" do
-        @conn = Connection.from_uri("mongodb://localhost:27017,mydb.com:27018", :connect => false)
-        assert_equal ['localhost', 27017], @conn.nodes[0]
-        assert_equal ['mydb.com', 27018], @conn.nodes[1]
-      end
-    end
-  end
-end