Some cleanup on integration test refactor; skip port for ipc

Author: fselmo

tests/integration/common.py

@@ -13,11 +13,11 @@
 
 
 class MiscWebSocketTest:
-    def test_websocket_max_size_error(self, w3, endpoint_uri):
-        w3 = Web3(
+    def test_websocket_max_size_error(self, w3):
+        w3_ = Web3(
             Web3.LegacyWebSocketProvider(
-                endpoint_uri=endpoint_uri, websocket_kwargs={"max_size": 1}
+                endpoint_uri=w3.provider.endpoint_uri, websocket_kwargs={"max_size": 1}
             )
         )
         with pytest.raises((OSError, ConnectionClosed)):
-            w3.eth.get_block(0)
+            w3_.eth.get_block(0)

tests/integration/go_ethereum/conftest.py

@@ -142,8 +142,10 @@ def wait_for_port(proc, timeout=10):
         line = proc.stderr.readline()
         if not line:
             continue
-
-        if match := re.compile(r"127\.0\.0\.1:(\d+)").search(line):
+        elif "geth.ipc" in line:
+            # ipc path will be retrieved via ``get_ipc_path()`` fixture
+            return None
+        elif match := re.compile(r"127\.0\.0\.1:(\d+)").search(line):
             port = int(match.group(1))
             if port not in {0, 80}:
                 # remove false positive matches

tests/integration/go_ethereum/test_goethereum_http.py

@@ -166,12 +166,10 @@ class TestGoEthereumAsyncNetModuleTest(GoEthereumAsyncNetModuleTest):
 
 class TestGoEthereumAsyncEthModuleTest(GoEthereumAsyncEthModuleTest):
     @pytest.mark.asyncio
-    async def test_async_http_provider_disconnects_gracefully(
-        self, async_w3, endpoint_uri
-    ) -> None:
+    async def test_async_http_provider_disconnects_gracefully(self, async_w3) -> None:
         w3_1 = async_w3
 
-        w3_2 = AsyncWeb3(AsyncHTTPProvider(endpoint_uri))
+        w3_2 = AsyncWeb3(AsyncHTTPProvider(async_w3.provider.endpoint_uri))
         assert w3_1 != w3_2
 
         await w3_1.eth.get_block("latest")