Fix some tests for 3.7

Author: smurfix

tests/python/test_base_events.py

@@ -212,17 +212,6 @@ def test_set_default_executor(self):
         self.loop.set_default_executor(executor)
         self.assertIs(executor, self.loop._default_executor)
 
-    async def test_getnameinfo(self):
-        sockaddr = mock.Mock()
-        self.loop.run_in_executor = mock.Mock()
-        if sys.version_info >= (3, 7):
-            await self.loop.getnameinfo(sockaddr)
-        else:
-            self.loop.getnameinfo(sockaddr)
-        self.assertEqual(
-            (None, socket.getnameinfo, sockaddr, 0), self.loop.run_in_executor.call_args[0]
-        )
-
     def test_call_soon(self):
         def cb():
             pass
@@ -1746,7 +1735,7 @@ def test_running_loop_within_a_loop(self):
         @asyncio.coroutine
         def runner(loop):
             async def slep():
-                asyncio.sleep(0.1, loop=loop)
+                await asyncio.sleep(0.1, loop=loop)
 
             loop.run_until_complete(slep())
 

tests/python/test_selector_events.py

@@ -193,8 +193,14 @@ def test_sock_recv(self):
             f = self.loop.create_task(f)
         else:
             self.assertEqual(type(f).__name__, asyncio.Future.__name__)
-        if sys.version_info >= (3, 6, 4):
-            self.loop._sock_recv.assert_called_with(f, None, sock, 1024)
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
+        self.assertEqual(self.loop._sock_recv.call_args[0][1:],
+                         (None, sock, 1024))
+
+        f.cancel()
+        with self.assertRaises(asyncio.CancelledError):
+            self.loop.run_until_complete(f)
 
     def test_sock_recv_reconnection(self):
         sock = mock.Mock()
@@ -207,6 +213,9 @@ def test_sock_recv_reconnection(self):
         fut = self.loop.sock_recv(sock, 1024)
         if sys.version_info >= (3, 7):
             fut = self.loop.create_task(fut)
+
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
         callback = self.loop.add_reader.call_args[0][1]
         params = self.loop.add_reader.call_args[0][2:]
 
@@ -216,6 +225,8 @@ def test_sock_recv_reconnection(self):
         sock.recv.side_effect = OSError(9)
         callback(*params)
 
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
         self.assertIsInstance(fut.exception(), OSError)
         if sys.version_info >= (3, 6, 4):
             self.assertEqual((10,), self.loop.remove_reader.call_args[0])
@@ -273,8 +284,10 @@ def test_sock_sendall(self):
             f = self.loop.create_task(f)
         else:
             self.assertEqual(type(f).__name__, asyncio.Future.__name__)
+
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
         call_args = self.loop._sock_sendall.call_args[0]
-        assert call_args[0] is f
         assert not call_args[1]
         assert call_args[2] is sock
         assert call_args[3] == b'data'
@@ -288,6 +301,9 @@ def test_sock_sendall_nodata(self):
             f = self.loop.create_task(f)
         else:
             self.assertEqual(type(f).__name__, asyncio.Future.__name__)
+
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
         self.assertTrue(f.done())
         self.assertIsNone(f.result())
         self.assertFalse(self.loop._sock_sendall.called)
@@ -303,6 +319,9 @@ def test_sock_sendall_reconnection(self):
         fut = self.loop.sock_sendall(sock, b'data')
         if sys.version_info >= (3, 7):
             fut = self.loop.create_task(fut)
+
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
         callback = self.loop.add_writer.call_args[0][1]
         params = self.loop.add_writer.call_args[0][2:]
 
@@ -312,6 +331,8 @@ def test_sock_sendall_reconnection(self):
         sock.send.side_effect = OSError(9)
         callback(*params)
 
+        self.loop.run_until_complete(asyncio.sleep(0.01, loop=self.loop))
+
         self.assertIsInstance(fut.exception(), OSError)
         if sys.version_info >= (3, 6, 4):
             self.assertEqual((10,), self.loop.remove_writer.call_args[0])