mongo 1.10.0.rc1 → 1.10.0

data/test/functional/grid_io_test.rb

@@ -35,9 +35,9 @@ class GridIOTest < Test::Unit::TestCase
         @mode     = 'w'
       end
 
-      should "set default 256k chunk size" do
+      should "set default 255k chunk size" do
         file = GridIO.new(@files, @chunks, @filename, @mode)
-        assert_equal 256 * 1024, file.chunk_size
+        assert_equal 255 * 1024, file.chunk_size
       end
 
       should "set chunk size" do

data/test/functional/grid_test.rb

@@ -262,7 +262,7 @@ class GridTest < Test::Unit::TestCase
       end
 
       should "put and get a large io object if reading less than the chunk size" do
-        read_and_write_stream('sample_data', 256 * 1024)
+        read_and_write_stream('sample_data', 255 * 1024)
       end
 
       should "put and get a large io object if reading more than the chunk size" do

data/test/replica_set/insert_test.rb

@@ -82,13 +82,26 @@ class ReplicaSetInsertTest < Test::Unit::TestCase
         assert_match_document(
             {
                 "ok" => 1,
-                "n" => 1,
+                "n" => 2,
+                "writeErrors" => [
+                    {
+                        "index" => 2,
+                        "code" => 11000,
+                        "errmsg" => /duplicate key error/,
+                    }
+                ],
                 "writeConcernError" => [
                     {
                         "errmsg" => /waiting for replication timed out|timed out waiting for slaves|timeout/,
                         "code" => 64,
                         "errInfo" => {"wtimeout" => true},
                         "index" => 0
+                    },
+                    {
+                        "errmsg" => /waiting for replication timed out|timed out waiting for slaves|timeout/,
+                        "code" => 64,
+                        "errInfo" => {"wtimeout" => true},
+                        "index" => 1
                     }
                 ],
                 "code" => 65,
@@ -96,6 +109,7 @@ class ReplicaSetInsertTest < Test::Unit::TestCase
                 "nInserted" => 1
             }, result, "wire_version:#{wire_version}")
       end
+      assert_equal 2, @coll.find.to_a.size
     end
 
     should "handle unordered errors with deferred write concern error - spec Merging Results" do # TODO - spec review

data/test/replica_set/replication_ack_test.rb

@@ -36,17 +36,23 @@ class ReplicaSetAckTest < Test::Unit::TestCase
   end
 
   def test_safe_mode_with_w_failure
-    assert_raise_error OperationFailure, "timeout" do
+    assert_raise_error WriteConcernError, "time" do
       @col.insert({:foo => 1}, :w => 4, :wtimeout => 1, :fsync => true)
     end
-    assert_raise_error OperationFailure, "timeout" do
+    assert_raise_error WriteConcernError, "time" do
       @col.update({:foo => 1}, {:foo => 2}, :w => 4, :wtimeout => 1, :fsync => true)
     end
-    assert_raise_error OperationFailure, "timeout" do
+    assert_raise_error WriteConcernError, "time" do
       @col.remove({:foo => 2}, :w => 4, :wtimeout => 1, :fsync => true)
     end
-    assert_raise_error OperationFailure do
-      @col.insert({:foo => 3}, :w => "test-tag")
+    if @client.server_version >= '2.5.4'
+      assert_raise_error WriteConcernError do
+        @col.insert({:foo => 3}, :w => "test-tag")
+      end
+    else # indistinguishable "errmsg"=>"exception: unrecognized getLastError mode: test-tag"
+      assert_raise_error OperationFailure do
+        @col.insert({:foo => 3}, :w => "test-tag")
+      end
     end
   end
 

data/test/shared/ssl_shared.rb

@@ -18,7 +18,9 @@ module SSLTests
   MONGODB_X509_USERNAME = 'CN=client,OU=kerneluser,O=10Gen,L=New York City,ST=New York,C=US'
   CERT_PATH             = "#{Dir.pwd}/test/fixtures/certificates/"
   CLIENT_CERT           = "#{CERT_PATH}client.pem"
+  CLIENT_CERT_PASS      = "#{CERT_PATH}password_protected.pem"
   CA_CERT               = "#{CERT_PATH}ca.pem"
+  PASS_PHRASE           = ENV['SSL_KEY_PASS_PHRASE']
 
   def create_client(*args)
     if @client_class == MongoClient
@@ -59,9 +61,16 @@ module SSLTests
                                    :ssl_cert   => CLIENT_CERT,
                                    :ssl_verify => true)
     end
+
+    # raises when key passphrase is given without key file
+    assert_raise MongoArgumentError do
+      create_client(@connect_info, :connect             => false,
+                                   :ssl                 => true,
+                                   :ssl_key_pass_phrase => PASS_PHRASE)
+    end
   end
 
-  # Requires MongoDB built with SSL and the follow options:
+  # Requires MongoDB built with SSL and the following options:
   #
   # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
   # --sslPEMKeyFile /path/to/server.pem \
@@ -76,7 +85,7 @@ module SSLTests
     assert client.connect
   end
 
-  # Requires MongoDB built with SSL and the follow options:
+  # Requires MongoDB built with SSL and the following options:
   #
   # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
   # --sslPEMKeyFile /path/to/server.pem \
@@ -115,7 +124,38 @@ module SSLTests
     end
   end
 
-  # Requires mongod built with SSL and the follow options:
+  # Requires MongoDB built with SSL and the following options:
+  #
+  # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
+  # --sslPEMKeyFile /path/to/password_protected.pem \
+  # --sslCAFile /path/to/ca.pem \
+  # --sslCRLFile /path/to/crl.pem
+  #
+  # Make sure you have 'server' as an alias for localhost in /etc/hosts.
+  # If SSL_KEY_PASS_PHRASE is not set as an environment variable,
+  # you will be prompted to enter a passphrase at runtime.
+  #
+  def test_ssl_with_key_pass_phrase
+    client = create_client(@connect_info, :connect             => false,
+                                          :ssl                 => true,
+                                          :ssl_cert            => CLIENT_CERT_PASS,
+                                          :ssl_key             => CLIENT_CERT_PASS,
+                                          :ssl_key_pass_phrase => PASS_PHRASE)
+    assert client.connect
+  end
+
+  def test_ssl_with_key_pass_phrase_fail
+    client = create_client(@connect_info, :connect             => false,
+                                          :ssl                 => true,
+                                          :ssl_cert            => CLIENT_CERT_PASS,
+                                          :ssl_key             => CLIENT_CERT_PASS,
+                                          :ssl_key_pass_phrase => "secret")
+    assert_raise OpenSSL::PKey::RSAError do
+      client.connect
+    end
+  end
+
+  # Requires mongod built with SSL and the following options:
   #
   # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
   # --sslPEMKeyFile /path/to/server.pem \
@@ -136,7 +176,7 @@ module SSLTests
 
   # X509 Authentication Tests
   #
-  # Requires MongoDB built with SSL and the follow options:
+  # Requires MongoDB built with SSL and the following options:
   #
   # mongod --auth --dbpath /path/to/data/directory --sslOnNormalPorts \
   # --sslPEMKeyFile /path/to/server.pem \

data/test/unit/pool_manager_test.rb

@@ -106,6 +106,37 @@ class PoolManagerUnitTest < Test::Unit::TestCase
       assert_equal [['localhost', 27020]], manager.arbiters
     end
 
+    should "return clones of pool lists" do
+
+      @db.stubs(:command).returns(
+        # First call to get a socket.
+        @ismaster.merge({'ismaster' => true}),
+
+        # Subsequent calls to configure pools.
+        @ismaster.merge({'ismaster' => true}),
+        @ismaster.merge({'secondary' => true, 'maxBsonObjectSize' => 500}),
+        @ismaster.merge({'secondary' => true, 'maxMessageSizeBytes' => 700}),
+        @ismaster.merge({'arbiterOnly' => true})
+      )
+
+      seeds = [['localhost', 27017], ['localhost', 27018]]
+      manager = Mongo::PoolManager.new(@client, seeds)
+      @client.stubs(:local_manager).returns(manager)
+      manager.connect
+
+      assert_not_equal manager.instance_variable_get(:@arbiters).object_id, manager.arbiters.object_id
+      assert_not_equal manager.instance_variable_get(:@secondaries).object_id, manager.secondaries.object_id
+      assert_not_equal manager.instance_variable_get(:@secondary_pools).object_id, manager.secondary_pools.object_id
+      assert_not_equal manager.instance_variable_get(:@hosts).object_id, manager.hosts.object_id
+      assert_not_equal manager.instance_variable_get(:@pools).object_id, manager.pools.object_id
+
+      assert_not_equal manager.instance_variable_get(:@arbiters).object_id, manager.state_snapshot[:arbiters].object_id
+      assert_not_equal manager.instance_variable_get(:@secondaries).object_id, manager.state_snapshot[:secondaries].object_id
+      assert_not_equal manager.instance_variable_get(:@secondary_pools).object_id, manager.state_snapshot[:secondary_pools].object_id
+      assert_not_equal manager.instance_variable_get(:@hosts).object_id, manager.state_snapshot[:hosts].object_id
+      assert_not_equal manager.instance_variable_get(:@pools).object_id, manager.state_snapshot[:pools].object_id
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 1.10.0.rc1
+  version: 1.10.0
 platform: ruby
 authors:
 - Tyler Brock
@@ -34,7 +34,7 @@ cert_chain:
   JrZM8w8wGbIOeLtoQqa7HB/jOYbTahH7KMNh2LHAbOR93hNIJxVRa4iwxiMQ75tN
   9WUIAJ4AEtjwRg1Bz0OwDo3aucPCBpx77+/FWhv7JYY=
   -----END CERTIFICATE-----
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -42,14 +42,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0.rc1
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0.rc1
+        version: 1.10.0
 description: A Ruby driver for MongoDB. For more information about Mongo, see http://www.mongodb.org.
 email: mongodb-dev@googlegroups.com
 executables:
@@ -182,9 +182,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: mongo
 rubygems_version: 2.2.2