more fixes

saghm · saghm · commit d91db3badc35 · 2018-12-19T18:06:31.000-05:00
diff --git a/source/uri-options/tests/auth-options.json b/source/uri-options/tests/auth-options.json
@@ -8,10 +8,10 @@
       "hosts": null,
       "auth": null,
       "options": {
-        "authmechanism": "GSSAPI",
+        "authMechanism": "GSSAPI",
         "authMechanismProperties": {
           "SERVICE_NAME": "other",
-          "CANONICALIZE_HOST_NAME": "true"
+          "CANONICALIZE_HOST_NAME": true
         },
         "authSource": "$external"
       }
diff --git a/source/uri-options/tests/auth-options.yml b/source/uri-options/tests/auth-options.yml
@@ -10,5 +10,5 @@ tests:
             authMechanism: "GSSAPI"
             authMechanismProperties:
                 SERVICE_NAME: "other"
-                CANONICALIZE_HOST_NAME: "true"
+                CANONICALIZE_HOST_NAME: true
             authSource: "$external"
diff --git a/source/uri-options/tests/connection-options.json b/source/uri-options/tests/connection-options.json
@@ -2,7 +2,7 @@
   "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&replicaSet=uri-options-spec&retryWrites=true&serverSelectionTimeoutMS=15000&socketTimeoutMS=7500",
+      "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": null,
diff --git a/source/uri-options/tests/connection-options.yml b/source/uri-options/tests/connection-options.yml
@@ -1,7 +1,7 @@
 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&replicaSet=uri-options-spec&retryWrites=true&serverSelectionTimeoutMS=15000&socketTimeoutMS=7500"
+        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: ~
diff --git a/source/uri-options/tests/read-preference-options.json b/source/uri-options/tests/read-preference-options.json
@@ -10,7 +10,7 @@
       "options": {
         "readPreference": "primaryPreferred",
         "readPreferenceTags": [
-          "dc:ny,rack",
+          "dc:ny,rack:1",
           "dc:ny"
         ],
         "maxStalenessSeconds": 120
diff --git a/source/uri-options/tests/tls-options.json b/source/uri-options/tests/tls-options.json
@@ -11,7 +11,7 @@
         "tls": true,
         "tlsCAFile": "ca.pem",
         "tlsCertificateKeyFile": "cert.pem",
-        "tlsCertificateKeyPassword": "hunter2"
+        "tlsCertificateKeyFilePassword": "hunter2"
       }
     },
     {
diff --git a/source/uri-options/tests/tls-options.yml b/source/uri-options/tests/tls-options.yml
@@ -10,7 +10,7 @@ tests:
             tls: true
             tlsCAFile: "ca.pem"
             tlsCertificateKeyFile: "cert.pem"
-            tlsCertificateKeyPassword: "hunter2"
+            tlsCertificateKeyFilePassword: "hunter2"
     -  
         description: "Invalid tlsAllowInvalidCertificates causes a warning"
         uri: "mongodb://example.com/?tlsAllowInvalidCertificates=invalid"

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"tests": [`
`3`	`3`	`{`
`4`	`4`	`"description": "Valid connection and timeout options are parsed correctly",`
`5`		`- "uri": "mongodb://example.com/?appname=URI-OPTIONS-SPEC-TEST&connectTimeoutMS=20000&heartbeatFrequencyMS=5000&localThresholdMS=3000&replicaSet=uri-options-spec&retryWrites=true&serverSelectionTimeoutMS=15000&socketTimeoutMS=7500",`
	`5`	`+ "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",`
`6`	`6`	`"valid": true,`
`7`	`7`	`"warning": false,`
`8`	`8`	`"hosts": null,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`tests:`
`2`	`2`	`-`
`3`	`3`	`description: "Valid connection and timeout options are parsed correctly"`
`4`		`- uri: "mongodb://example.com/?appname=URI-OPTIONS-SPEC-TEST&connectTimeoutMS=20000&heartbeatFrequencyMS=5000&localThresholdMS=3000&replicaSet=uri-options-spec&retryWrites=true&serverSelectionTimeoutMS=15000&socketTimeoutMS=7500"`
	`4`	`+ 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"`
`5`	`5`	`valid: true`
`6`	`6`	`warning: false`
`7`	`7`	`hosts: ~`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"tls": true,`
`12`	`12`	`"tlsCAFile": "ca.pem",`
`13`	`13`	`"tlsCertificateKeyFile": "cert.pem",`
`14`		`- "tlsCertificateKeyPassword": "hunter2"`
	`14`	`+ "tlsCertificateKeyFilePassword": "hunter2"`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ tests:`
`10`	`10`	`tls: true`
`11`	`11`	`tlsCAFile: "ca.pem"`
`12`	`12`	`tlsCertificateKeyFile: "cert.pem"`
`13`		`- tlsCertificateKeyPassword: "hunter2"`
	`13`	`+ tlsCertificateKeyFilePassword: "hunter2"`
`14`	`14`	`-`
`15`	`15`	`description: "Invalid tlsAllowInvalidCertificates causes a warning"`
`16`	`16`	`uri: "mongodb://example.com/?tlsAllowInvalidCertificates=invalid"`