Apply awesome re-assert library for regex assertions in tests (#5134)

aiohttp/web_fileresponse.py

@@ -100,10 +100,7 @@ async def sendfile(self) -> None:
             self.transport.write(data)
             if self._count != 0:
                 await loop.sendfile(
-                    self.transport,
-                    self._fobj,
-                    self._offset,
-                    self._count
+                    self.transport, self._fobj, self._offset, self._count
                 )
             await super().write_eof()
             return

requirements/ci-wheel.txt

@@ -11,6 +11,7 @@ multidict==5.0.0
 pytest==6.1.1
 pytest-cov==2.10.1
 pytest-mock==3.3.1
+re-assert==1.1.0
 typing_extensions==3.7.4.3
 yarl==1.6.1
 

tests/test_client_session.py

@@ -2,14 +2,14 @@
 import contextlib
 import gc
 import json
-import re
 import sys
 from http.cookies import SimpleCookie
 from io import BytesIO
 from unittest import mock
 
 import pytest
 from multidict import CIMultiDict, MultiDict
+from re_assert import Matches
 from yarl import URL
 
 import aiohttp
@@ -321,8 +321,9 @@ async def make_sess():
                 return ClientSession(connector=connector, loop=loop)
 
             loop.run_until_complete(make_sess())
-        assert re.match(
-            "Session and connector has to use same event loop", str(ctx.value)
+        assert (
+            Matches("Session and connector has to use same event loop")
+            == str(ctx.value).strip()
         )
 
 

tests/test_signals.py

@@ -1,8 +1,8 @@
-import re
 from unittest import mock
 
 import pytest
 from multidict import CIMultiDict
+from re_assert import Matches
 
 from aiohttp.signals import Signal
 from aiohttp.test_utils import make_mocked_coro, make_mocked_request
@@ -162,7 +162,6 @@ async def test_repr(app) -> None:
 
     signal.append(callback)
 
-    assert re.match(
-        r"<Signal owner=<Application .+>, frozen=False, " r"\[<Mock id='\d+'>\]>",
-        repr(signal),
-    )
+    assert Matches(
+        r"<Signal owner=<Application .+>, frozen=False, " r"\[<Mock id='\d+'>\]>"
+    ) == repr(signal)

tests/test_streams.py

@@ -3,13 +3,13 @@
 import abc
 import asyncio
 import gc
-import re
 import types
 from collections import defaultdict
 from itertools import groupby
 from unittest import mock
 
 import pytest
+from re_assert import Matches
 
 from aiohttp import streams
 
@@ -949,7 +949,7 @@ async def test___repr__waiter(self) -> None:
         loop = asyncio.get_event_loop()
         stream = self._make_one()
         stream._waiter = loop.create_future()
-        assert re.search(r"<StreamReader w=<Future pending[\S ]*>>", repr(stream))
+        assert Matches(r"<StreamReader w=<Future pending[\S ]*>>") == repr(stream)
         stream._waiter.set_result(None)
         await stream._waiter
         stream._waiter = None

tests/test_urldispatch.py

@@ -5,6 +5,7 @@
 from urllib.parse import unquote
 
 import pytest
+from re_assert import Matches
 from yarl import URL
 
 import aiohttp
@@ -312,7 +313,7 @@ def test_double_add_url_with_the_same_name(router) -> None:
     regexp = "Duplicate 'name', already handled by"
     with pytest.raises(ValueError) as ctx:
         router.add_route("GET", "/get_other", handler2, name="name")
-    assert re.match(regexp, str(ctx.value))
+    assert Matches(regexp) == str(ctx.value)
 
 
 def test_route_plain(router) -> None:
@@ -503,7 +504,7 @@ def test_contains(router) -> None:
 
 def test_static_repr(router) -> None:
     router.add_static("/get", os.path.dirname(aiohttp.__file__), name="name")
-    assert re.match(r"<StaticResource 'name' /get", repr(router["name"]))
+    assert Matches(r"<StaticResource 'name' /get") == repr(router["name"])
 
 
 def test_static_adds_slash(router) -> None:
@@ -625,7 +626,7 @@ async def test_regular_match_info(router) -> None:
     req = make_mocked_request("GET", "/get/john")
     match_info = await router.resolve(req)
     assert {"name": "john"} == match_info
-    assert re.match("<MatchInfo {'name': 'john'}: .+<Dynamic.+>>", repr(match_info))
+    assert Matches("<MatchInfo {'name': 'john'}: .+<Dynamic.+>>") == repr(match_info)
 
 
 async def test_match_info_with_plus(router) -> None:

tests/test_web_response.py

@@ -2,12 +2,12 @@
 import datetime
 import gzip
 import json
-import re
 from concurrent.futures import ThreadPoolExecutor
 from unittest import mock
 
 import pytest
 from multidict import CIMultiDict, CIMultiDictProxy
+from re_assert import Matches
 
 from aiohttp import HttpVersion, HttpVersion10, HttpVersion11, hdrs, signals
 from aiohttp.payload import BytesPayload
@@ -314,7 +314,7 @@ async def test_chunked_encoding_forbidden_for_http_10() -> None:
 
     with pytest.raises(RuntimeError) as ctx:
         await resp.prepare(req)
-    assert re.match("Using chunked encoding is forbidden for HTTP/1.0", str(ctx.value))
+    assert Matches("Using chunked encoding is forbidden for HTTP/1.0") == str(ctx.value)
 
 
 async def test_compression_no_accept() -> None:
@@ -689,7 +689,7 @@ def test_response_cookies() -> None:
         'Set-Cookie: name=("")?; '
         "expires=Thu, 01 Jan 1970 00:00:00 GMT; Max-Age=0; Path=/"
     )
-    assert re.match(expected, str(resp.cookies))
+    assert Matches(expected) == str(resp.cookies)
 
     resp.set_cookie("name", "value", domain="local.host")
     expected = "Set-Cookie: name=value; Domain=local.host; Path=/"
@@ -741,7 +741,7 @@ def test_response_cookie__issue_del_cookie() -> None:
         'Set-Cookie: name=("")?; '
         "expires=Thu, 01 Jan 1970 00:00:00 GMT; Max-Age=0; Path=/"
     )
-    assert re.match(expected, str(resp.cookies))
+    assert Matches(expected) == str(resp.cookies)
 
 
 def test_cookie_set_after_del() -> None:
@@ -981,13 +981,15 @@ async def test_send_headers_for_empty_body(buf, writer) -> None:
     await resp.prepare(req)
     await resp.write_eof()
     txt = buf.decode("utf8")
-    assert re.match(
-        "HTTP/1.1 200 OK\r\n"
-        "Content-Length: 0\r\n"
-        "Content-Type: application/octet-stream\r\n"
-        "Date: .+\r\n"
-        "Server: .+\r\n\r\n",
-        txt,
+    assert (
+        Matches(
+            "HTTP/1.1 200 OK\r\n"
+            "Content-Length: 0\r\n"
+            "Content-Type: application/octet-stream\r\n"
+            "Date: .+\r\n"
+            "Server: .+\r\n\r\n"
+        )
+        == txt
     )
 
 
@@ -999,14 +1001,16 @@ async def test_render_with_body(buf, writer) -> None:
     await resp.write_eof()
 
     txt = buf.decode("utf8")
-    assert re.match(
-        "HTTP/1.1 200 OK\r\n"
-        "Content-Length: 4\r\n"
-        "Content-Type: application/octet-stream\r\n"
-        "Date: .+\r\n"
-        "Server: .+\r\n\r\n"
-        "data",
-        txt,
+    assert (
+        Matches(
+            "HTTP/1.1 200 OK\r\n"
+            "Content-Length: 4\r\n"
+            "Content-Type: application/octet-stream\r\n"
+            "Date: .+\r\n"
+            "Server: .+\r\n\r\n"
+            "data"
+        )
+        == txt
     )
 
 
@@ -1019,14 +1023,16 @@ async def test_send_set_cookie_header(buf, writer) -> None:
     await resp.write_eof()
 
     txt = buf.decode("utf8")
-    assert re.match(
-        "HTTP/1.1 200 OK\r\n"
-        "Content-Length: 0\r\n"
-        "Set-Cookie: name=value\r\n"
-        "Content-Type: application/octet-stream\r\n"
-        "Date: .+\r\n"
-        "Server: .+\r\n\r\n",
-        txt,
+    assert (
+        Matches(
+            "HTTP/1.1 200 OK\r\n"
+            "Content-Length: 0\r\n"
+            "Set-Cookie: name=value\r\n"
+            "Content-Type: application/octet-stream\r\n"
+            "Date: .+\r\n"
+            "Server: .+\r\n\r\n"
+        )
+        == txt
     )