mongo 2.11.6 → 2.12.0.rc0

data/spec/spec_tests/data/sdam/rs/{primary_address_change.yml → ruby_primary_address_change.yml}

@@ -1,3 +1,5 @@
+# This test was used during Ruby driver SDAM implementation.
+# It is not worthwhile to upstream it to specifications repo.
 description: Primary whose address differs from client address but no me mismatch
 uri: mongodb://localhost:27017/?replicaSet=rs
 phases:

data/spec/spec_tests/data/sdam/sharded/ruby_discovered_single_mongos.yml

@@ -0,0 +1,27 @@
+description: "Discovered single mongos"
+
+# Ruby driver performs topology discovery by default.
+# This test verifies that a URI with just a server address results in
+# the sharded topology if the server replies that it is a mongos.
+# As part of https://jira.mongodb.org/browse/SPEC-1248 this test can be
+# adjusted to use directConnection=false option, at which point it will
+# apply to all drivers.
+uri: "mongodb://a"
+
+phases:
+
+  - responses:
+    -
+      - "a:27017"
+      -
+        ok: 1
+        ismaster: true
+        msg: "isdbgrid"
+    
+    outcome:
+      servers:
+        "a:27017":
+          type: "Mongos"
+          setName:
+      topologyType: "Sharded"
+      setName:

data/spec/spec_tests/data/sdam/sharded/{primary_address_change.yml → ruby_primary_different_address.yml}

@@ -1,4 +1,4 @@
-description: RS Primary whose address differs from client address but no me mismatch
+description: RS Primary in forced sharded topology with a different address from client but no me mismatch
 uri: mongodb://localhost:27017/?connect=sharded
 phases:
 -

data/spec/spec_tests/data/sdam/sharded/{primary_mismatched_me.yml → ruby_primary_mismatched_me.yml}

@@ -1,4 +1,4 @@
-description: RS Primary w/mismatched me
+description: RS Primary in forced sharded topology with me mismatch
 uri: mongodb://localhost:27017/?connect=sharded
 phases:
 -

data/spec/spec_tests/data/sdam/single/{primary_address_change.yml → ruby_primary_different_address.yml}

@@ -1,4 +1,4 @@
-description: RS Primary whose address differs from client address but no me mismatch
+description: RS Primary in forced single topology with a different address from client but no me mismatch
 uri: mongodb://localhost:27017/?connect=direct
 phases:
 -

data/spec/spec_tests/data/sdam/single/{primary_mismatched_me.yml → ruby_primary_mismatched_me.yml}

@@ -1,4 +1,4 @@
-description: RS Primary w/mismatched me
+description: RS Primary in forced single topology with me mismatch
 uri: mongodb://localhost:27017/?connect=direct
 phases:
 -

data/spec/spec_tests/data/sdam_monitoring/{replica_set_with_primary_change.yml → replica_set_primary_address_change.yml}

@@ -1,6 +1,7 @@
 description: "Monitoring a topology that is a replica set with primary address change"
 uri: "mongodb://a,b"
 phases: 
+  # phase 1 - initial events
   -
     responses: []
     outcome:
@@ -37,7 +38,8 @@ phases:
           server_opening_event: 
             topologyId: "42"
             address: "b:27017"
-  # phase 1 - discover topology
+  
+  # phase 2 - discover topology
   - 
     responses: 
       - 
@@ -109,8 +111,7 @@ phases:
                   setName: "rs"
                   type: "RSPrimary"
 
-
-  # phase 2 - primary changes ip address
+  # phase 3 - primary changes address
   - 
     responses: 
       - 
@@ -128,7 +129,28 @@ phases:
           maxWireVersion: 4
     outcome: 
       events: 
-        # TODO see about having the opening event precede the closing event.
+        - 
+          server_description_changed_event: 
+            topologyId: "42"
+            address: "a:27017"
+            previousDescription: 
+              address: "a:27017"
+              arbiters: []
+              hosts: 
+                - "a:27017"
+              passives: []
+              primary: "a:27017"
+              setName: "rs"
+              type: "RSPrimary"
+            newDescription: 
+              address: "a:27017"
+              arbiters: []
+              hosts: 
+                - "aa:27017"
+              passives: []
+              primary: "aa:27017"
+              setName: "rs"
+              type: "RSPrimary"
         - 
           server_closed_event: 
             topologyId: "42"
@@ -164,7 +186,7 @@ phases:
                   passives: []
                   type: "Unknown"
 
-  # phaes 3 - response from new primary from new address
+  # phase 4 - response from primary on new address
   - 
     responses: 
       - 

data/spec/spec_tests/data/sdam_monitoring/replica_set_with_me_mismatch.yml

@@ -1,6 +1,7 @@
 description: "Monitoring a topology that is a replica set with a me mismatch in first response"
 uri: "mongodb://a,b/"
 phases: 
+  # phase 1 - initial events
   -
     responses: []
     outcome:
@@ -37,7 +38,8 @@ phases:
           server_opening_event: 
             topologyId: "42"
             address: "b:27017"
-  # phase 1 - server is a primary with mismatched me
+  
+  # phase 2 - server is a primary with mismatched me
   - 
     responses: 
       - 
@@ -48,66 +50,9 @@ phases:
           setName: "rs"
           setVersion: 1
           me: "aa:27017"
-          primary: "aa:27017"
+          primary: "a:27017"
           hosts: 
-            - "aa:27017"
-          minWireVersion: 0
-          maxWireVersion: 4
-    outcome: 
-      events: 
-        # TODO see about having the opening event precede the closing event.
-        - 
-          server_closed_event: 
-            topologyId: "42"
-            address: "a:27017"
-        - 
-          server_closed_event: 
-            topologyId: "42"
-            address: "b:27017"
-        - 
-          server_opening_event: 
-            topologyId: "42"
-            address: "aa:27017"
-        - 
-          topology_description_changed_event: 
-            topologyId: "42"
-            previousDescription: 
-              topologyType: "Unknown"
-              servers: 
-                - 
-                  address: "a:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-                - 
-                  address: "b:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-            newDescription:
-              topologyType: "ReplicaSetNoPrimary"
-              setName: rs
-              servers: 
-                - 
-                  address: "aa:27017"
-                  arbiters: []
-                  hosts: []
-                  passives: []
-
-  # phaes 2 - response from new primary from new address
-  - 
-    responses: 
-      - 
-        - "aa:27017"
-        - 
-          ok: 1
-          ismaster: true
-          setName: "rs"
-          setVersion: 1
-          primary: "aa:27017"
-          me: "aa:27017"
-          hosts: 
-            - "aa:27017"
+            - "a:27017"
           minWireVersion: 0
           maxWireVersion: 4
     outcome: 
@@ -115,45 +60,52 @@ phases:
         - 
           server_description_changed_event: 
             topologyId: "42"
-            address: "aa:27017"
+            address: "a:27017"
             previousDescription: 
-              address: "aa:27017"
+              address: "a:27017"
               arbiters: []
               hosts: []
               passives: []
               type: "Unknown"
             newDescription: 
-              address: "aa:27017"
+              address: "a:27017"
               arbiters: []
               hosts: 
-                - "aa:27017"
+                - "a:27017"
               passives: []
-              primary: "aa:27017"
+              primary: "a:27017"
               setName: "rs"
               type: "RSPrimary"
         - 
-          topology_description_changed_event: 
+          server_closed_event: 
+            topologyId: "42"
+            address: "b:27017"
+        - 
+          topology_description_changed_event:
             topologyId: "42"
             previousDescription: 
-              topologyType: "ReplicaSetNoPrimary"
-              setName: rs
+              topologyType: "Unknown"
               servers: 
                 - 
-                  address: "aa:27017"
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                - 
+                  address: "b:27017"
                   arbiters: []
                   hosts: []
                   passives: []
-                  type: "Unknown"
             newDescription:
               topologyType: "ReplicaSetWithPrimary"
-              setName: "rs"
+              setName: rs
               servers: 
                 - 
-                  address: "aa:27017"
+                  address: "a:27017"
                   arbiters: []
                   hosts: 
-                    - "aa:27017"
+                    - "a:27017"
                   passives: []
-                  primary: "aa:27017"
+                  primary: "a:27017"
                   setName: "rs"
                   type: "RSPrimary"

data/spec/spec_tests/data/sdam_monitoring/replica_set_with_removal.yml

@@ -2,22 +2,7 @@ description: "Monitoring a replica set with non member"
 uri: "mongodb://a,b/"
 phases:
   -
-    responses:
-      -
-        - "a:27017"
-        - {
-            ok: 1,
-            ismaster: true,
-            setName: "rs",
-            setVersion: 1.0,
-            primary: "a:27017",
-            hosts: [ "a:27017" ],
-            minWireVersion: 0,
-            maxWireVersion: 4
-          }
-      -
-        - "b:27017"
-        - { ok: 1, ismaster: true }
+    responses: []
     outcome:
       events:
         -
@@ -52,6 +37,25 @@ phases:
           server_opening_event:
             topologyId: "42"
             address: "b:27017"
+  -
+    responses:
+      -
+        - "a:27017"
+        - {
+            ok: 1,
+            ismaster: true,
+            setName: "rs",
+            setVersion: 1.0,
+            primary: "a:27017",
+            hosts: [ "a:27017" ],
+            minWireVersion: 0,
+            maxWireVersion: 4
+          }
+      -
+        - "b:27017"
+        - { ok: 1, ismaster: true }
+    outcome:
+      events:
         -
           server_description_changed_event:
             topologyId: "42"

data/spec/spec_tests/data/sdam_monitoring/standalone_suppress_equal_description_changes.yml

@@ -0,0 +1,73 @@
+description: "Monitoring a forced standalone connection - suppress update events for equal server descriptions"
+uri: "mongodb://a:27017/?connect=direct"
+phases:
+  -
+    responses:
+      -
+        - "a:27017"
+        - { ok: 1, ismaster: true, minWireVersion: 0, maxWireVersion: 4 }
+      -
+        - "a:27017"
+        - { ok: 1, ismaster: true, minWireVersion: 0, maxWireVersion: 4 }
+
+    outcome:
+      events:
+        -
+          topology_opening_event:
+            topologyId: "42"
+        -
+          topology_description_changed_event:
+            topologyId: "42"
+            previousDescription:
+              topologyType: "Unknown"
+              servers: []
+            newDescription:
+              topologyType: "Single"
+              servers:
+                -
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+        -
+          server_opening_event:
+            topologyId: "42"
+            address: "a:27017"
+        -
+          server_description_changed_event:
+            topologyId: "42"
+            address: "a:27017"
+            previousDescription:
+              address: "a:27017"
+              arbiters: []
+              hosts: []
+              passives: []
+              type: "Unknown"
+            newDescription:
+              address: "a:27017"
+              arbiters: []
+              hosts: []
+              passives: []
+              type: "Standalone"
+        -
+          topology_description_changed_event:
+            topologyId: "42"
+            previousDescription:
+              topologyType: "Single"
+              servers:
+                -
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Unknown"
+            newDescription:
+              topologyType: "Single"
+              servers:
+                -
+                  address: "a:27017"
+                  arbiters: []
+                  hosts: []
+                  passives: []
+                  type: "Standalone"

data/spec/spec_tests/data/transactions/pin-mongos.yml

@@ -317,7 +317,7 @@ tests:
           insertedIds: {0: 3, 1: 4}
       # Session is pinned.
       - *assertSessionPinned
-      # Fail the commit with a non-transient error, eg MaxTimeMSExpired.
+      # Fail the commit with a non-transient error.
       - name: targetedFailPoint
         object: testRunner
         arguments:
@@ -327,8 +327,7 @@ tests:
             mode: { times: 1 }
             data:
               failCommands: ["commitTransaction"]
-              # https://jira.mongodb.org/browse/SPEC-1378
-              errorCode: 51 # not MaxTimeMSExpired
+              errorCode: 51 # ManualInterventionRequired
       - name: commitTransaction
         object: session0
         result:

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

@@ -12,3 +12,13 @@ tests:
                 SERVICE_NAME: "other"
                 CANONICALIZE_HOST_NAME: true
             authSource: "$external"
+    -
+        description: "Valid auth options are parsed correctly (SCRAM-SHA-1)"
+        uri: "mongodb://foo:bar@example.com/?authMechanism=SCRAM-SHA-1&authSource=authSourceDB"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
+            authMechanism: "SCRAM-SHA-1"
+            authSource: "authSourceDB"

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

@@ -1,7 +1,7 @@
 tests:
     -
         description: "Valid required tls options are parsed correctly"
-        uri: "mongodb://example.com/?tls=true&tlsCAFile=ca.pem&tlsCertificateKeyFile=cert.pem&tlsCertificateKeyFilePassword=hunter2"
+        uri: "mongodb://example.com/?tls=true&tlsCAFile=ca.pem&tlsCertificateKeyFile=cert.pem"
         valid: true
         warning: false
         hosts: ~
@@ -10,6 +10,14 @@ tests:
             tls: true
             tlsCAFile: "ca.pem"
             tlsCertificateKeyFile: "cert.pem"
+    -
+        description: "Valid tlsCertificateKeyFilePassword is parsed correctly"
+        uri: "mongodb://example.com/?tlsCertificateKeyFilePassword=hunter2"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options:
             tlsCertificateKeyFilePassword: "hunter2"
     -  
         description: "Invalid tlsAllowInvalidCertificates causes a warning"
@@ -63,8 +71,8 @@ tests:
         options:
             tlsInsecure: true
     -  
-        description: "Invalid tlsAllowInsecure causes a warning"
-        uri: "mongodb://example.com/?tlsAllowInsecure=invalid"
+        description: "Invalid tlsInsecure causes a warning"
+        uri: "mongodb://example.com/?tlsInsecure=invalid"
         valid: true
         warning: true
         hosts: ~
@@ -86,6 +94,22 @@ tests:
         hosts: ~
         auth: ~
         options: {}
+    -
+        description: "tlsAllowInvalidCertificates and tlsInsecure both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=true&tlsInsecure=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidCertificates and tlsInsecure both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidCertificates=false&tlsInsecure=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
     -
         description: "tlsInsecure and tlsAllowInvalidHostnames both present (and true) raises an error"
         uri: "mongodb://example.com/?tlsInsecure=true&tlsAllowInvalidHostnames=true"
@@ -102,6 +126,22 @@ tests:
         hosts: ~
         auth: ~
         options: {}
+    -
+        description: "tlsAllowInvalidHostnames and tlsInsecure both present (and true) raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidHostnames=true&tlsInsecure=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "tlsAllowInvalidHostnames and tlsInsecure both present (and false) raises an error"
+        uri: "mongodb://example.com/?tlsAllowInvalidHostnames=false&tlsInsecure=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
     -
         description: "tls=true and ssl=true doesn't warn"
         uri: "mongodb://example.com/?tls=true&ssl=true"
@@ -118,6 +158,22 @@ tests:
         hosts: ~
         auth: ~
         options: {}
+    -
+        description: "ssl=true and tls=true doesn't warn"
+        uri: "mongodb://example.com/?ssl=true&tls=true"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "ssl=false and tls=false doesn't warn"
+        uri: "mongodb://example.com/?ssl=false&tls=false"
+        valid: true
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
     -
         description: "tls=false and ssl=true raises error"
         uri: "mongodb://example.com/?tls=false&ssl=true"
@@ -134,4 +190,19 @@ tests:
         hosts: ~
         auth: ~
         options: {}
-
+    -
+        description: "ssl=false and tls=true raises error"
+        uri: "mongodb://example.com/?ssl=false&tls=true"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}
+    -
+        description: "ssl=true and tls=false raises error"
+        uri: "mongodb://example.com/?ssl=true&tls=false"
+        valid: false
+        warning: false
+        hosts: ~
+        auth: ~
+        options: {}