mongo 2.6.4 → 2.7.0.rc0

data/spec/spec_tests/data/uri_options/compression-options.yml

@@ -0,0 +1,48 @@
+tests:
+    -
+        description: "Valid compression options are parsed correctly"
+        uri: "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=9"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            compressors: 
+              - "zlib"
+            zlibCompressionLevel: 9
+    -
+        description: "Multiple compressors are parsed correctly"
+        uri: "mongodb://example.com/?compressors=snappy,zlib"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options:
+            compressors:
+              - "snappy"
+              - "zlib"
+    -
+        description: "Non-numeric zlibCompressionLevel causes a warning"
+        uri: "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low zlibCompressionLevel causes a warning"
+        uri: "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too high zlibCompressionLevel causes a warning"
+        uri: "mongodb://example.com/?compressors=zlib&zlibCompressionLevel=10"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+

data/spec/spec_tests/data/uri_options/concern-options.yml

@@ -0,0 +1,55 @@
+tests:
+    -
+        description: "Valid read and write concern are parsed correctly"
+        uri: "mongodb://example.com/?readConcernLevel=majority&w=5&wTimeoutMS=30000&journal=false"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            readConcernLevel: "majority"
+            w: 5
+            wTimeoutMS: 30000
+            journal: false
+    -
+        description: "Arbitrary string readConcernLevel does not cause a warning"
+        uri: "mongodb://example.com/?readConcernLevel=arbitraryButStillValid"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            readConcernLevel: "arbitraryButStillValid"
+    -
+        description: "Arbitrary string w doesn't cause a warning"
+        uri: "mongodb://example.com/?w=arbitraryButStillValid"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            w: "arbitraryButStillValid"
+    -
+        description: "Non-numeric wTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?wTimeoutMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low wTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?wTimeoutMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Invalid journal causes a warning"
+        uri: "mongodb://example.com/?journal=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}

data/spec/spec_tests/data/uri_options/connection-options.yml

@@ -0,0 +1,106 @@
+tests:
+    -
+        description: "Valid connection and timeout options are parsed correctly"
+        uri: "mongodb://example.com/?appname=URI-OPTIONS-SPEC-TEST&connectTimeoutMS=20000&heartbeatFrequencyMS=5000&localThresholdMS=3000&maxIdleTimeMS=50000&replicaSet=uri-options-spec&retryWrites=true&serverSelectionTimeoutMS=15000&socketTimeoutMS=7500"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            appname: "URI-OPTIONS-SPEC-TEST"
+            connectTimeoutMS: 20000
+            heartbeatFrequencyMS: 5000
+            localThresholdMS: 3000
+            maxIdleTimeMS: 50000
+            replicaSet: "uri-options-spec"
+            retryWrites: true
+            serverSelectionTimeoutMS: 15000
+            socketTimeoutMS: 7500
+    -
+        description: "Non-numeric connectTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?connectTimeoutMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low connectTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?connectTimeoutMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Non-numeric heartbeatFrequencyMS causes a warning"
+        uri: "mongodb://example.com/?heartbeatFrequencyMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low heartbeatFrequencyMS causes a warning"
+        uri: "mongodb://example.com/?heartbeatFrequencyMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Non-numeric localThresholdMS causes a warning"
+        uri: "mongodb://example.com/?localThresholdMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low localThresholdMS causes a warning"
+        uri: "mongodb://example.com/?localThresholdMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    - 
+        description: "Invalid retryWrites causes a warning"
+        uri: "mongodb://example.com/?retryWrites=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Non-numeric serverSelectionTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?serverSelectionTimeoutMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low serverSelectionTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?serverSelectionTimeoutMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Non-numeric socketTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?socketTimeoutMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low socketTimeoutMS causes a warning"
+        uri: "mongodb://example.com/?socketTimeoutMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}

data/spec/spec_tests/data/uri_options/connection-pool-options.yml

@@ -0,0 +1,26 @@
+tests:
+    -
+        description: "Valid connection pool options are parsed correctly"
+        uri: "mongodb://example.com/?maxIdleTimeMS=50000"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            maxIdleTimeMS: 50000
+    -
+        description: "Non-numeric maxIdleTimeMS causes a warning"
+        uri: "mongodb://example.com/?maxIdleTimeMS=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low maxIdleTimeMS causes a warning"
+        uri: "mongodb://example.com/?maxIdleTimeMS=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}

data/spec/spec_tests/data/uri_options/read-preference-options.yml

@@ -0,0 +1,42 @@
+tests:
+    -
+        description: "Valid read preference options are parsed correctly"
+        uri: "mongodb://example.com/?readPreference=primaryPreferred&readPreferenceTags=dc:ny,rack:1&maxStalenessSeconds=120&readPreferenceTags=dc:ny"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            readPreference: "primaryPreferred"
+            readPreferenceTags:
+                - 
+                    dc: "ny"
+                    rack: "1"
+                -
+                    dc: "ny"
+            maxStalenessSeconds: 120
+    -
+        description: "Invalid readPreferenceTags causes a warning"
+        uri: "mongodb://example.com/?readPreferenceTags=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Non-numeric maxStalenessSeconds causes a warning"
+        uri: "mongodb://example.com/?maxStalenessSeconds=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "Too low maxStalenessSeconds causes a warning"
+        uri: "mongodb://example.com/?maxStalenessSeconds=-2"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+

data/spec/spec_tests/data/uri_options/tls-options.yml

@@ -0,0 +1,89 @@
+tests:
+    -
+        description: "Valid required tls options are parsed correctly"
+        uri: "mongodb://example.com/?tls=true&tlsCAFile=ca.pem&tlsCertificateKeyFile=cert.pem&tlsCertificateKeyFilePassword=hunter2"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            tls: true
+            tlsCAFile: "ca.pem"
+            tlsCertificateKeyFile: "cert.pem"
+            tlsCertificateKeyFilePassword: "hunter2"
+    -  
+        description: "Invalid tlsAllowInvalidCertificates causes a warning"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidCertificates is parsed correctly"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=true"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            tlsAllowInvalidCertificates: true
+    -  
+        description: "Invalid tlsAllowInvalidCertificates causes a warning"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidHostnames is parsed correctly"
+        uri: "mongodb://example.com/?tlsAllowInvalidHostnames=true"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            tlsAllowInvalidHostnames: true
+    -  
+        description: "Invalid tlsAllowInvalidHostnames causes a warning"
+        uri: "mongodb://example.com/?tlsAllowInvalidHostnames=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure is parsed correctly"
+        uri: "mongodb://example.com/?tlsInsecure=true"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            tlsInsecure: true
+    -  
+        description: "Invalid tlsAllowInsecure causes a warning"
+        uri: "mongodb://example.com/?tlsAllowInsecure=invalid"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure=true and tlsAllowInvalidCertificates=false warns"
+        uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidCertificates=false"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsInsecure=true and tlsAllowInvalidHostnames=false warns"
+        uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidHostnames=false"
+        valid: true
+        warning: true
+        hosts: ~
+        auth: ~
+        options: {}
+  

data/spec/spec_tests/dns_seedlist_discovery_spec.rb

@@ -5,46 +5,6 @@ describe 'DNS Seedlist Discovery' do
 
   include Mongo::ConnectionString
 
-  before(:all) do
-
-    module Mongo
-      class Server
-        # The constructor keeps the same API, but does not instantiate a
-        # monitor and run it.
-        alias :original_initialize :initialize
-
-        def initialize(address, cluster, monitoring, event_listeners, options = {})
-          @address = address
-          @cluster = cluster
-          @monitoring = monitoring
-          @options = options.freeze
-          @monitor = Monitor.new(address, event_listeners, options)
-        end
-
-        # Disconnect simply needs to return true since we have no monitor and
-        # no connection.
-        alias :original_disconnect! :disconnect!
-
-        def disconnect!;
-          true;
-        end
-      end
-    end
-  end
-
-  after(:all) do
-
-    module Mongo
-      class Server
-        alias :initialize :original_initialize
-        remove_method(:original_initialize)
-
-        alias :disconnect! :original_disconnect!
-        remove_method(:original_disconnect!)
-      end
-    end
-  end
-
   DNS_SEEDLIST_DISCOVERY_TESTS.each do |file_name|
 
     file = File.new(file_name)

data/spec/spec_tests/gridfs_spec.rb

@@ -45,6 +45,6 @@ describe 'GridFS' do
           end
         end
       end
-    end 
+    end
   end
 end

data/spec/spec_tests/max_staleness_spec.rb

@@ -9,9 +9,21 @@ describe 'Max Staleness Spec' do
     spec = Mongo::ServerSelection::Read::Spec.new(file)
 
     context(spec.description) do
+      # Cluster needs a topology and topology needs a cluster...
+      # This temporary cluster is used for topology construction.
+      let(:temp_cluster) do
+        double('temp cluster').tap do |cluster|
+          allow(cluster).to receive(:servers_list).and_return([])
+        end
+      end
 
       let(:topology) do
-        spec.type.new({}, monitoring, [])
+        options = if spec.type <= Mongo::Cluster::Topology::ReplicaSetNoPrimary
+          {replica_set_name: 'foo'}
+        else
+          {}
+        end
+        spec.type.new(options, monitoring, temp_cluster)
       end
 
       let(:monitoring) do
@@ -24,9 +36,9 @@ describe 'Max Staleness Spec' do
 
       let(:options) do
         if spec.heartbeat_frequency
-          TEST_OPTIONS.merge(heartbeat_frequency: spec.heartbeat_frequency)
+          SpecConfig.instance.test_options.merge(heartbeat_frequency: spec.heartbeat_frequency)
         else
-          TEST_OPTIONS.dup.tap do |opts|
+          SpecConfig.instance.test_options.dup.tap do |opts|
             opts.delete(:heartbeat_frequency)
           end
         end.merge!(server_selection_timeout: 0.2, connect_timeout: 0.1)
@@ -34,6 +46,7 @@ describe 'Max Staleness Spec' do
 
       let(:cluster) do
         double('cluster').tap do |c|
+          allow(c).to receive(:summary)
           allow(c).to receive(:topology).and_return(topology)
           allow(c).to receive(:single?).and_return(topology.single?)
           allow(c).to receive(:sharded?).and_return(topology.sharded?)
@@ -58,8 +71,10 @@ describe 'Max Staleness Spec' do
             allow(s).to receive(:secondary?).and_return(server['type'] == 'RSSecondary')
             allow(s).to receive(:primary?).and_return(server['type'] == 'RSPrimary')
             allow(s).to receive(:connectable?).and_return(true)
-            allow(s).to receive(:last_write_date).and_return(server['lastWrite']['lastWriteDate']['$numberLong'].to_i) if server['lastWrite']
-            allow(s).to receive(:last_scan).and_return(server['lastUpdateTime'])
+            allow(s).to receive(:last_write_date).and_return(
+              Time.at(server['lastWrite']['lastWriteDate']['$numberLong'].to_f / 1000)) if server['lastWrite']
+            allow(s).to receive(:last_scan).and_return(
+              Time.at(server['lastUpdateTime'].to_f / 1000))
             allow(s).to receive(:features).and_return(features)
           end
         end
@@ -67,9 +82,7 @@ describe 'Max Staleness Spec' do
 
       let(:in_latency_window) do
         spec.in_latency_window.collect do |server|
-          s = Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners, options)
-          s.monitor.stop!
-          s
+          Mongo::Server.new(Mongo::Address.new(server['address']), cluster, monitoring, listeners, options.merge(monitor: false))
         end
       end