tests: Split test_create_connection_1 into two tests

Author: Yury Selivanov

tests/test_tcp.py

@@ -318,19 +318,7 @@ async def test():
 
         self.loop.run_until_complete(test())
 
-    def test_create_connection_1(self):
-        CNT = 0
-        TOTAL_CNT = 100
-
-        def server(sock):
-            data = sock.recv_all(4)
-            self.assertEqual(data, b'AAAA')
-            sock.send(b'OK')
-
-            data = sock.recv_all(4)
-            self.assertEqual(data, b'BBBB')
-            sock.send(b'SPAM')
-
+    def test_create_connection_open_con_addr(self):
         async def client(addr):
             reader, writer = await asyncio.open_connection(
                 *addr,
@@ -352,12 +340,12 @@ async def client(addr):
                 self.assertTrue(
                     sock.getsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY))
 
-            nonlocal CNT
-            CNT += 1
-
             writer.close()
 
-        async def client_2(addr):
+        self._test_create_connection_1(client)
+
+    def test_create_connection_open_con_sock(self):
+        async def client(addr):
             sock = socket.socket()
             sock.connect(addr)
             reader, writer = await asyncio.open_connection(
@@ -370,11 +358,28 @@ async def client_2(addr):
             writer.write(b'BBBB')
             self.assertEqual(await reader.readexactly(4), b'SPAM')
 
+            writer.close()
+
+        self._test_create_connection_1(client)
+
+    def _test_create_connection_1(self, client):
+        CNT = 0
+        TOTAL_CNT = 100
+
+        def server(sock):
+            data = sock.recv_all(4)
+            self.assertEqual(data, b'AAAA')
+            sock.send(b'OK')
+
+            data = sock.recv_all(4)
+            self.assertEqual(data, b'BBBB')
+            sock.send(b'SPAM')
+
+        async def client_wrapper(addr):
+            await client(addr)
             nonlocal CNT
             CNT += 1
 
-            writer.close()
-
         def run(coro):
             nonlocal CNT
             CNT = 0
@@ -391,8 +396,7 @@ def run(coro):
 
             self.assertEqual(CNT, TOTAL_CNT)
 
-        run(client)
-        run(client_2)
+        run(client_wrapper)
 
     def test_create_connection_2(self):
         sock = socket.socket()