Merge pull request #2917 from tornaria/test-musl

fix test regexes for musl libc

Author: A5rocks

src/trio/_tests/test_fakenet.py

@@ -10,7 +10,7 @@
 
 # ENOTCONN gives different messages on different platforms
 if sys.platform == "linux":
-    ENOTCONN_MSG = r"^\[Errno 107\] Transport endpoint is not connected$"
+    ENOTCONN_MSG = r"^\[Errno 107\] (Transport endpoint is|Socket) not connected$"
 elif sys.platform == "darwin":
     ENOTCONN_MSG = r"^\[Errno 57\] Socket is not connected$"
 else:
@@ -41,7 +41,7 @@ async def test_basic_udp() -> None:
 
     # Cannot bind multiple sockets to the same address
     with pytest.raises(
-        OSError, match=r"^\[\w+ \d+\] (Address already in use|Unknown error)$"
+        OSError, match=r"^\[\w+ \d+\] (Address (already )?in use|Unknown error)$"
     ) as exc:
         await s2.bind(("127.0.0.1", port))
     assert exc.value.errno == errno.EADDRINUSE

src/trio/_tests/test_highlevel_open_tcp_listeners.py

@@ -94,7 +94,7 @@ async def test_open_tcp_listeners_rebind() -> None:
         probe.setsockopt(stdlib_socket.SOL_SOCKET, stdlib_socket.SO_REUSEADDR, 1)
         with pytest.raises(
             OSError,
-            match="(Address already in use|An attempt was made to access a socket in a way forbidden by its access permissions)$",
+            match="(Address (already )?in use|An attempt was made to access a socket in a way forbidden by its access permissions)$",
         ):
             probe.bind(sockaddr1)