ensure options are compared correctly (they were not being compared before)

Author: prashantmital

test/test_uri_spec.py

@@ -22,6 +22,7 @@
 
 sys.path[0:0] = [""]
 
+from pymongo.common import INTERNAL_URI_OPTION_NAME_MAP, validate
 from pymongo.uri_parser import parse_uri
 from test import clear_warning_registry, unittest
 
@@ -114,14 +115,24 @@ def run_scenario(self):
                                      % (auth[elm], options[elm]))
 
         # Compare URI options.
+        err_msg = "For option %s expected %s but got %s"
         if test['options'] is not None:
+            opts = options['options']
             for opt in test['options']:
-                if options.get(opt) is not None:
+                lopt = opt.lower()
+                optname = INTERNAL_URI_OPTION_NAME_MAP.get(lopt, lopt)
+                if opts.get(optname) is not None:
+                    if opts[optname] == test['options'][opt]:
+                        expected_value = test['options'][opt]
+                    else:
+                        expected_value = validate(
+                            lopt, test['options'][opt])[1]
                     self.assertEqual(
-                        options[opt], test['options'][opt],
-                        "For option %s expected %s but got %s"
-                        % (opt, options[opt],
-                           test['options'][opt]))
+                        opts[optname], expected_value,
+                        err_msg % (opt, expected_value, opts[optname],))
+                else:
+                    self.fail(
+                        "Missing expected option %s" % (opt,))
 
     return run_scenario_in_dir(test_workdir)(run_scenario)
 

test/uri_options/auth-options.json

@@ -11,7 +11,7 @@
         "authmechanism": "GSSAPI",
         "authMechanismProperties": {
           "SERVICE_NAME": "other",
-          "CANONICALIZE_HOST_NAME": "true"
+          "CANONICALIZE_HOST_NAME": true
         },
         "authSource": "$external"
       }

test/uri_options/connection-options.json

@@ -12,7 +12,6 @@
         "connectTimeoutMS": 20000,
         "heartbeatFrequencyMS": 5000,
         "localThresholdMS": 3000,
-        "maxIdleTimeMS": 50000,
         "replicaSet": "uri-options-spec",
         "retryWrites": true,
         "serverSelectionTimeoutMS": 15000,

test/uri_options/read-preference-options.json

@@ -10,7 +10,7 @@
       "options": {
         "readPreference": "primaryPreferred",
         "readPreferenceTags": [
-          "dc:ny,rack",
+          "dc:ny,rack:1",
           "dc:ny"
         ],
         "maxStalenessSeconds": 120

test/uri_options/tls-options.json

@@ -11,7 +11,7 @@
         "tls": true,
         "tlsCAFile": "ca.pem",
         "tlsCertificateKeyFile": "cert.pem",
-        "tlsCertificateKeyPassword": "hunter2"
+        "tlsCertificateKeyFilePassword": "hunter2"
       }
     },
     {