fix tests (await syntax)

aioredis/connection.py

@@ -283,8 +283,7 @@ def execute(self, command, *args, encoding=_NOTSET):
           is broken.
         """
         if self._reader is None or self._reader.at_eof():
-            msg = self._close_msg if self._close_msg else\
-                    "Connection closed or corrupted"
+            msg = self._close_msg or "Connection closed or corrupted"
             raise ConnectionClosedError(msg)
         if command is None:
             raise TypeError("command must not be None")

tests/connection_test.py

@@ -107,16 +107,16 @@ async def test_connect_unixsocket_timeout(create_connection, loop, server):
 
 @pytest.mark.run_loop
 @pytest.redis_version(2, 8, 0, reason="maxclients config setting")
-def test_connect_maxclients(request, create_connection, loop, start_server):
+async def test_connect_maxclients(create_connection, loop, start_server):
     server = start_server('server-maxclients')
-    conn = yield from create_connection(
+    conn = await create_connection(
         server.tcp_address, loop=loop)
-    yield from conn.execute(b'CONFIG', b'SET', 'maxclients', 1)
+    await conn.execute(b'CONFIG', b'SET', 'maxclients', 1)
 
-    with pytest.raises(MaxClientsError):
-        conn2 = yield from create_connection(
+    with pytest.raises((MaxClientsError, ConnectionError)):
+        conn2 = await create_connection(
             server.tcp_address, loop=loop)
-        yield from conn2.execute('ping')
+        await conn2.execute('ping')
 
 
 def test_global_loop(create_connection, loop, server):

tests/pool_test.py

@@ -468,7 +468,7 @@ async def test_pool_check_closed_when_exception(
     await redis.config_set('maxclients', 2)
 
     with pytest.logs('aioredis', 'DEBUG') as cm:
-        with pytest.raises(MaxClientsError):
+        with pytest.raises((MaxClientsError, ConnectionError)):
             await create_pool(address=tuple(server.tcp_address),
                               minsize=3, loop=loop)