Another set of fixes

Author: 1st1

Lib/test/test_asyncio/test_server.py

@@ -4,6 +4,7 @@
 import threading
 import unittest
 
+from test import support
 from test.test_asyncio import utils as test_utils
 from test.test_asyncio import functional as func_tests
 
@@ -17,7 +18,13 @@ def test_start_server_1(self):
         HELLO_MSG = b'1' * 1024 * 5 + b'\n'
 
         def client(sock, addr):
-            time.sleep(0.2)
+            for i in range(10):
+                time.sleep(0.2)
+                if srv.is_serving():
+                    break
+            else:
+                raise RuntimeError
+
             sock.settimeout(2)
             sock.connect(addr)
             sock.send(HELLO_MSG)
@@ -36,7 +43,7 @@ async def main(srv):
                 await srv.serve_forever()
 
         srv = self.loop.run_until_complete(asyncio.start_server(
-            serve, '0.0.0.0', 0, loop=self.loop, start_serving=False))
+            serve, support.HOSTv4, 0, loop=self.loop, start_serving=False))
 
         self.assertFalse(srv.is_serving())