mongo 1.8.6 → 1.9.0

data/test/functional/conversions_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 require 'mongo/exceptions'
 require 'mongo/util/conversions'

data/test/functional/cursor_fail_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 require 'logger'
 

data/test/functional/cursor_message_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 require 'logger'
 

data/test/functional/cursor_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 require 'logger'
 
@@ -198,7 +212,7 @@ class CursorTest < Test::Unit::TestCase
     @@coll.save({:t => 't1'})
     @@coll.save({:t => 't1'})
     @@coll.save({:t => 't1'})
-    sleep(2)
+    sleep(1)
     t2 = Time.now
     t2_id = ObjectId.from_time(t2)
     @@coll.save({:t => 't2'})

data/test/functional/db_api_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class DBAPITest < Test::Unit::TestCase
@@ -614,7 +628,7 @@ HERE
                       :initial => {"count" => 0}, :reduce => "function (obj, prev) { prev.count++; }")[0]["count"]
 
     finalize = "function (obj) { obj.f = obj.count - 1; }"
-    assert_equal 2, test.group(:initial => {"count" => 0}, 
+    assert_equal 2, test.group(:initial => {"count" => 0},
                       :reduce => "function (obj, prev) { prev.count++; }", :finalize => finalize)[0]["f"]
 
     test.insert("a" => 2, "b" => 3)

data/test/functional/db_connection_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class DBConnectionTest < Test::Unit::TestCase

data/test/functional/db_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 require 'digest/md5'
 require 'stringio'

data/test/functional/grid_file_system_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class GridFileSystemTest < Test::Unit::TestCase
@@ -73,7 +87,7 @@ class GridFileSystemTest < Test::Unit::TestCase
       end
 
       should "return the first n bytes even with an offset" do
-        data = @grid.open('sample.file', 'r') do |f| 
+        data = @grid.open('sample.file', 'r') do |f|
           f.seek(1000)
           f.read(288888)
         end
@@ -123,7 +137,6 @@ class GridFileSystemTest < Test::Unit::TestCase
          @old = @grid.open('sample', 'r')
 
          @new_data = "DATA" * 10
-         sleep(2)
          @grid.open('sample', 'w') do |f|
            f.write @new_data
          end
@@ -145,7 +158,6 @@ class GridFileSystemTest < Test::Unit::TestCase
 
        context "and on a second overwrite" do
          setup do
-           sleep(2)
            @new_data = "NEW" * 1000
            @grid.open('sample', 'w') do |f|
              f.write @new_data
@@ -176,7 +188,7 @@ class GridFileSystemTest < Test::Unit::TestCase
            assert !@ids.include?(id)
            assert_equal @versions, @db['fs.files'].find({'filename' => 'sample'}).count
          end
-         
+
          should "delete old versions on write with :delete_old is passed in" do
            @grid.open('sample', 'w', :delete_old => true) do |f|
              f.write @new_data

data/test/functional/grid_io_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class GridIOTest < Test::Unit::TestCase

data/test/functional/grid_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 include Mongo
 

data/test/functional/pool_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 require 'thread'
 
@@ -5,7 +19,7 @@ class PoolTest < Test::Unit::TestCase
   include Mongo
 
   def setup
-    @client    ||= standard_connection({:pool_size => 500, :pool_timeout => 5})
+    @client    ||= standard_connection({:pool_size => 15, :pool_timeout => 5})
     @db         = @client.db(MONGO_TEST_DB)
     @collection = @db.collection("pool_test")
   end
@@ -18,7 +32,7 @@ class PoolTest < Test::Unit::TestCase
       threads << Thread.new do
         original_socket = pool.checkout
         pool.checkin(original_socket)
-        5000.times do
+        500.times do
           socket = pool.checkout
           assert_equal original_socket, socket
           pool.checkin(socket)
@@ -30,17 +44,19 @@ class PoolTest < Test::Unit::TestCase
   end
 
   def test_pool_affinity_max_size
-    8000.times {|x| @collection.insert({:value => x})}
+    docs = []
+    8000.times {|x| docs << {:value => x}}
+    @collection.insert(docs)
+
     threads = []
     threads << Thread.new do
       @collection.find({"value" => {"$lt" => 100}}).each {|e| e}
       Thread.pass
-      sleep(5)
+      sleep(0.125)
       @collection.find({"value" => {"$gt" => 100}}).each {|e| e}
     end
-    sleep(1)
     threads << Thread.new do
-      @collection.find({'$where' => "function() {for(i=0;i<8000;i++) {this.value};}"}).each {|e| e}
+      @collection.find({'$where' => "function() {for(i=0;i<1000;i++) {this.value};}"}).each {|e| e}
     end
     threads.each(&:join)
   end

data/test/functional/safe_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 include Mongo
 

data/test/functional/ssl_test.rb

@@ -0,0 +1,109 @@
+require 'test_helper'
+
+class SSLCertValidationTest < Test::Unit::TestCase
+  include Mongo
+
+  CERT_PATH   = "#{Dir.pwd}/test/fixtures/certificates/"
+  CLIENT_CERT = "#{CERT_PATH}client.pem"
+  CA_CERT     = "#{CERT_PATH}ca.pem"
+
+  # This test doesn't connect, no server config required
+  def test_ssl_configuration
+    # raises when ssl=false and ssl opts specified
+    assert_raise MongoArgumentError do
+      MongoClient.new('server', 27017, :connect  => false,
+                                       :ssl      => false,
+                                       :ssl_cert => CLIENT_CERT)
+    end
+
+    # raises when ssl=nil and ssl opts specified
+    assert_raise MongoArgumentError do
+      MongoClient.new('server', 27017, :connect => false,
+                                       :ssl_key => CLIENT_CERT)
+    end
+
+    # raises when verify=true and no ca_cert
+    assert_raise MongoArgumentError do
+      MongoClient.new('server', 27017, :connect    => false,
+                                       :ssl        => true,
+                                       :ssl_key    => CLIENT_CERT,
+                                       :ssl_cert   => CLIENT_CERT,
+                                       :ssl_verify => true)
+    end
+  end
+
+  # Requires MongoDB built with SSL and the follow options:
+  #
+  # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
+  # --sslPEMKeyFile /path/to/server.pem \
+  # --sslCAFile /path/to/ca.pem \
+  # --sslCRLFile /path/to/crl.pem \
+  # --sslWeakCertificateValidation
+  #
+  # Make sure you have 'server' as an alias for localhost in /etc/hosts
+  #
+  def test_ssl_basic
+    client = MongoClient.new('server', 27017, :connect => false,
+                                              :ssl     => true)
+    assert client.connect
+  end
+
+  # Requires MongoDB built with SSL and the follow options:
+  #
+  # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
+  # --sslPEMKeyFile /path/to/server.pem \
+  # --sslCAFile /path/to/ca.pem \
+  # --sslCRLFile /path/to/crl.pem
+  #
+  # Make sure you have 'server' as an alias for localhost in /etc/hosts
+  #
+  def test_ssl_with_cert
+    client = MongoClient.new('server', 27017, :connect  => false,
+                                              :ssl      => true,
+                                              :ssl_cert => CLIENT_CERT,
+                                              :ssl_key  => CLIENT_CERT)
+    assert client.connect
+  end
+
+  def test_ssl_with_peer_cert_validation
+    client = MongoClient.new('server', 27017, :connect     => false,
+                                              :ssl         => true,
+                                              :ssl_key     => CLIENT_CERT,
+                                              :ssl_cert    => CLIENT_CERT,
+                                              :ssl_verify  => true,
+                                              :ssl_ca_cert => CA_CERT)
+    assert client.connect
+  end
+
+  def test_ssl_peer_cert_validation_hostname_fail
+    client = MongoClient.new('localhost', 27017, :connect     => false,
+                                                 :ssl         => true,
+                                                 :ssl_key     => CLIENT_CERT,
+                                                 :ssl_cert    => CLIENT_CERT,
+                                                 :ssl_verify  => true,
+                                                 :ssl_ca_cert => CA_CERT)
+    assert_raise ConnectionFailure do
+      client.connect
+    end
+  end
+
+  # Requires mongod built with SSL and the follow options:
+  #
+  # mongod --dbpath /path/to/data/directory --sslOnNormalPorts \
+  # --sslPEMKeyFile /path/to/server.pem \
+  # --sslCAFile /path/to/ca.pem \
+  # --sslCRLFile /path/to/crl_client_revoked.pem
+  #
+  # Make sure you have 'server' as an alias for localhost in /etc/hosts
+  #
+  def test_ssl_with_invalid_cert
+    assert_raise ConnectionFailure do
+      MongoClient.new('server', 27017, :ssl         => true,
+                                       :ssl_key     => CLIENT_CERT,
+                                       :ssl_cert    => CLIENT_CERT,
+                                       :ssl_verify  => true,
+                                       :ssl_ca_cert => CA_CERT)
+    end
+  end
+
+end

data/test/functional/support_test.rb

@@ -1,3 +1,17 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class SupportTest < Test::Unit::TestCase

data/test/functional/threading_test.rb

@@ -1,10 +1,24 @@
+# Copyright (C) 2013 10gen Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 require 'test_helper'
 
 class TestThreading < Test::Unit::TestCase
 
   include Mongo
 
-  @@client = standard_connection(:pool_size => 10, :pool_timeout => 30)
+  @@client = standard_connection(:pool_size => 2, :pool_timeout => 30)
   @@db     = @@client[MONGO_TEST_DB]
   @@coll   = @@db.collection('thread-test-collection')
 
@@ -25,7 +39,7 @@ class TestThreading < Test::Unit::TestCase
     times = []
     set_up_safe_data
     threads = []
-    100.times do |i|
+    25.times do |i|
       threads[i] = Thread.new do
         100.times do
           if i % 2 == 0
@@ -43,7 +57,7 @@ class TestThreading < Test::Unit::TestCase
       end
     end
 
-    100.times do |i|
+    25.times do |i|
       threads[i].join
     end
   end
@@ -51,7 +65,7 @@ class TestThreading < Test::Unit::TestCase
   def test_safe_insert
     set_up_safe_data
     threads = []
-    100.times do |i|
+    25.times do |i|
       threads[i] = Thread.new do
         if i % 2 == 0
           assert_raise Mongo::OperationFailure do
@@ -63,7 +77,7 @@ class TestThreading < Test::Unit::TestCase
       end
     end
 
-    100.times do |i|
+    25.times do |i|
       threads[i].join
     end
   end
@@ -72,9 +86,9 @@ class TestThreading < Test::Unit::TestCase
     @@coll.drop
     @@coll = @@db.collection('thread-test-collection')
 
-    1000.times do |i|
-      @@coll.insert({"x" => i})
-    end
+    docs = []
+    1000.times {|i| docs << {:x => i}}
+    @@coll.insert(docs)
 
     threads = []