pytest doesn't fail from pytest.raises with wrong error

aioredis/connection.py

@@ -140,6 +140,7 @@ def _read_data(self):
                 break
             if data == b'' and self._reader.at_eof():
                 logger.debug("Connection has been closed by server")
+                break
             self._parser.feed(data)
             while True:
                 try:

tests/conftest.py

@@ -558,6 +558,21 @@ def raises_regex(exc_type, message):
         .format(message, str(exc_info.value)))
 
 
+@contextlib.contextmanager
+def raises_only(exc_type, message=None):
+    try:
+        with pytest.raises(exc_type) as exc_info:
+            yield exc_info
+    except Exception as unexpected:
+        pytest.fail("Raised {!r} instead of {!r}".format(unexpected, exc_type))
+    else:
+        if message is not None:
+            match = re.search(message, str(exc_info.value))
+            assert match is not None, (
+                "Pattern {!r} does not match {!r}"
+                .format(message, str(exc_info.value)))
+
+
 def logs(logger, level=None):
     """Catches logs for given logger and level.
 
@@ -649,6 +664,7 @@ def assert_almost_equal(first, second, places=None, msg=None, delta=None):
 def pytest_namespace():
     return {
         'raises_regex': raises_regex,
+        'raises_only': raises_only,
         'assert_almost_equal': assert_almost_equal,
         'redis_version': redis_version,
         'logs': logs,

tests/connection_commands_test.py

@@ -45,14 +45,15 @@ def test_ping(redis):
 
 
 @pytest.mark.run_loop
-def test_quit(redis):
+def test_quit(redis, loop):
     try:
         assert b'OK' == (yield from redis.quit())
     except asyncio.CancelledError:
         pass
 
-    if not isinstance(redis._pool_or_conn, ConnectionsPool):
-        with pytest.raises(ConnectionClosedError):
+    if not isinstance(redis.connection, ConnectionsPool):
+        assert redis.connection.closed
+        with pytest.raises_only(ConnectionClosedError):
             yield from redis.ping()