fix test

Author: blink1073

test/asynchronous/test_auth.py

@@ -273,6 +273,13 @@ async def test_gssapi_threaded(self):
                 self.assertTrue(thread.success)
 
     async def test_gssapi_canonicalize_host_name(self):
+        # Test the low level method.
+        result = _canonicalize_hostname(GSSAPI_HOST, "forward")
+        if "compute-1.amazonaws.com" not in result:
+            self.assertEqual(result, GSSAPI_HOST)
+        result = _canonicalize_hostname(GSSAPI_HOST, "forwardAndReverse")
+        self.assertEqual(result, GSSAPI_HOST)
+
         # Use the equivalent named CANONICALIZE_HOST_NAME.
         props = self.mech_properties.copy()
         if props["CANONICALIZE_HOST_NAME"] == "true":
@@ -292,18 +299,6 @@ async def test_gssapi_canonicalize_host_name(self):
         if props["CANONICALIZE_HOST_NAME"] == "none":
             return
 
-        # Test with "forward".
-        props["CANONICALIZE_HOST_NAME"] = "forward"
-        client = self.simple_client(
-            GSSAPI_HOST,
-            GSSAPI_PORT,
-            username=GSSAPI_PRINCIPAL,
-            password=GSSAPI_PASS,
-            authMechanism="GSSAPI",
-            authMechanismProperties=props,
-        )
-        await client.server_info()
-
     async def test_gssapi_host_name(self):
         props = self.mech_properties
         props["SERVICE_HOST"] = "example.com"
@@ -331,13 +326,6 @@ async def test_gssapi_host_name(self):
         )
         await client.server_info()
 
-    def test_canonicalize_host_name(self):
-        result = _canonicalize_hostname(GSSAPI_HOST, "forward")
-        if "compute-1.amazonaws.com" not in result:
-            self.assertEqual(result, GSSAPI_HOST)
-        result = _canonicalize_hostname(GSSAPI_HOST, "forwardAndReverse")
-        self.assertEqual(result, GSSAPI_HOST)
-
 
 class TestSASLPlain(AsyncPyMongoTestCase):
     @classmethod

test/test_auth.py

@@ -273,6 +273,13 @@ def test_gssapi_threaded(self):
                 self.assertTrue(thread.success)
 
     def test_gssapi_canonicalize_host_name(self):
+        # Test the low level method.
+        result = _canonicalize_hostname(GSSAPI_HOST, "forward")
+        if "compute-1.amazonaws.com" not in result:
+            self.assertEqual(result, GSSAPI_HOST)
+        result = _canonicalize_hostname(GSSAPI_HOST, "forwardAndReverse")
+        self.assertEqual(result, GSSAPI_HOST)
+
         # Use the equivalent named CANONICALIZE_HOST_NAME.
         props = self.mech_properties.copy()
         if props["CANONICALIZE_HOST_NAME"] == "true":
@@ -292,18 +299,6 @@ def test_gssapi_canonicalize_host_name(self):
         if props["CANONICALIZE_HOST_NAME"] == "none":
             return
 
-        # Test with "forward".
-        props["CANONICALIZE_HOST_NAME"] = "forward"
-        client = self.simple_client(
-            GSSAPI_HOST,
-            GSSAPI_PORT,
-            username=GSSAPI_PRINCIPAL,
-            password=GSSAPI_PASS,
-            authMechanism="GSSAPI",
-            authMechanismProperties=props,
-        )
-        client.server_info()
-
     def test_gssapi_host_name(self):
         props = self.mech_properties
         props["SERVICE_HOST"] = "example.com"
@@ -331,13 +326,6 @@ def test_gssapi_host_name(self):
         )
         client.server_info()
 
-    def test_canonicalize_host_name(self):
-        result = _canonicalize_hostname(GSSAPI_HOST, "forward")
-        if "compute-1.amazonaws.com" not in result:
-            self.assertEqual(result, GSSAPI_HOST)
-        result = _canonicalize_hostname(GSSAPI_HOST, "forwardAndReverse")
-        self.assertEqual(result, GSSAPI_HOST)
-
 
 class TestSASLPlain(PyMongoTestCase):
     @classmethod