]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
asyncio: Slight rearrangement of tests for server_hostname=...
authorGuido van Rossum <guido@dropbox.com>
Fri, 1 Nov 2013 21:24:28 +0000 (14:24 -0700)
committerGuido van Rossum <guido@dropbox.com>
Fri, 1 Nov 2013 21:24:28 +0000 (14:24 -0700)
Lib/test/test_asyncio/test_base_events.py

index f093ed0c9bc178e40a11ff3c35d57e50361374b3..9b883c5211e498eac152b0e64f79e6b916e020e1 100644 (file)
@@ -444,7 +444,7 @@ class BaseEventLoopWithSelectorTests(unittest.TestCase):
         self.assertRaises(
             OSError, self.loop.run_until_complete, coro)
 
-    def test_create_connection_server_hostname_default(self):
+    def test_create_connection_ssl_server_hostname_default(self):
         self.loop.getaddrinfo = unittest.mock.Mock()
 
         def mock_getaddrinfo(*args, **kwds):
@@ -490,8 +490,8 @@ class BaseEventLoopWithSelectorTests(unittest.TestCase):
                                                          server_side=False,
                                                          server_hostname='')
 
-    def test_create_connection_server_hostname_errors(self):
-        # When not using ssl, server_hostname must be None (but '' is OK).
+    def test_create_connection_no_ssl_server_hostname_errors(self):
+        # When not using ssl, server_hostname must be None.
         coro = self.loop.create_connection(MyProto, 'python.org', 80,
                                            server_hostname='')
         self.assertRaises(ValueError, self.loop.run_until_complete, coro)
@@ -499,6 +499,7 @@ class BaseEventLoopWithSelectorTests(unittest.TestCase):
                                            server_hostname='python.org')
         self.assertRaises(ValueError, self.loop.run_until_complete, coro)
 
+    def test_create_connection_ssl_server_hostname_errors(self):
         # When using ssl, server_hostname may be None if host is non-empty.
         coro = self.loop.create_connection(MyProto, '', 80, ssl=True)
         self.assertRaises(ValueError, self.loop.run_until_complete, coro)