Fix tests for Python 3.9

Author: fantix

tests/test_base.py

@@ -636,9 +636,9 @@ def test_shutdown_asyncgens_02(self):
 
         def logger(loop, context):
             nonlocal logged
-            self.assertIn('asyncgen', context)
             expected = 'an error occurred during closing of asynchronous'
             if expected in context['message']:
+                self.assertIn('asyncgen', context)
                 logged += 1
 
         waiter = self._compile_agen('''async def waiter(timeout):

tests/test_process_spawning.py

@@ -20,7 +20,10 @@ async def run(loop):
             dummy_workers = [simulate_loop_activity(loop, event)
                              for _ in range(5)]
             spawn_worker = spawn_external_process(loop, event)
-            done, pending = await asyncio.wait([spawn_worker] + dummy_workers)
+            done, pending = await asyncio.wait([
+                asyncio.ensure_future(fut)
+                for fut in ([spawn_worker] + dummy_workers)
+            ])
             exceptions = [result.exception()
                           for result in done if result.exception()]
             if exceptions:

tests/test_sockets.py

@@ -223,8 +223,13 @@ async def client(addr):
             with sock_client:
                 await self.loop.sock_connect(sock_client, addr)
                 _, pending_read_futs = await asyncio.wait(
-                    [self.loop.sock_recv(sock_client, 1)],
-                    timeout=1)
+                    [
+                        asyncio.ensure_future(
+                            self.loop.sock_recv(sock_client, 1)
+                        )
+                    ],
+                    timeout=1,
+                )
 
                 async def send_server_data():
                     # Wait a little bit to let reader future cancel and
@@ -273,8 +278,13 @@ async def client(addr):
             with sock_client:
                 await self.loop.sock_connect(sock_client, addr)
                 _, pending_read_futs = await asyncio.wait(
-                    [self.loop.sock_recv(sock_client, 1)],
-                    timeout=1)
+                    [
+                        asyncio.ensure_future(
+                            self.loop.sock_recv(sock_client, 1)
+                        )
+                    ],
+                    timeout=1,
+                )
 
                 # server can send the data in a random time, even before
                 # the previous result future has cancelled.

tests/test_tcp.py

@@ -2526,8 +2526,13 @@ def unwrap_server(sock):
                 except ssl.SSLError as ex:
                     # Since OpenSSL 1.1.1, it raises "application data after
                     # close notify"
+                    # Python < 3.8:
                     if ex.reason == 'KRB5_S_INIT':
                         break
+                    # Python >= 3.8:
+                    if ex.reason == 'APPLICATION_DATA_AFTER_CLOSE_NOTIFY':
+                        break
+                    raise ex
                 except OSError as ex:
                     # OpenSSL < 1.1.1
                     if ex.errno != 0:

tests/test_udp.py

@@ -308,7 +308,7 @@ def datagram_received(self, data, addr):
 
                 s2.send(b'hello, socketpair')
                 addr = self.loop.run_until_complete(
-                    asyncio.wait_for(peername, 1, loop=self.loop))
+                    asyncio.wait_for(peername, 1))
                 if sys.platform.startswith('linux'):
                     self.assertEqual(addr, None)
                 else:
@@ -322,7 +322,7 @@ def datagram_received(self, data, addr):
                     tr.sendto(data)
                     result = self.loop.run_until_complete(asyncio.wait_for(
                         self.loop.run_in_executor(None, s2.recv, 1024),
-                        1, loop=self.loop))
+                        1))
                     self.assertEqual(data, result)
 
                 tr.close()