Mark socket-based tests as network and run them only once

Author: FrancescAlted

pytest.ini

@@ -30,7 +30,7 @@ testpaths =
 
 markers =
     heavy: tests that take long time to complete.
-    network: tests that require network access.
+    network: tests that require real network sockets, including localhost HTTP/S3 servers.
     tui: b2view Textual UI tests; each one boots a headless app session.
     xdist_group: pin a module to one `-n` worker; declared here so it is not an
         unknown mark (i.e. an error, given filterwarnings) when xdist is absent.

tests/conftest.py

@@ -115,12 +115,13 @@ def cat2_context():
         yield c2params
 
 
+@pytest.hookimpl(wrapper=True)
 def pytest_runtest_call(item):
     # Skip network-marked tests when their endpoint or optional credentials are unavailable.
     if item.get_closest_marker("network") is None:
-        return
+        return (yield)
     try:
-        item.runtest()
+        return (yield)
     except _NETWORK_ERRORS as exc:
         pytest.skip(f"Skipping unavailable network test: {exc}")
 

tests/ctable/test_remote_parquet.py

@@ -814,6 +814,7 @@ def _raise_not_found_for_status(self, response, path):
     assert marker == {"size": "49961641", "x-bz-file-id": "file-version-1"}
 
 
+@pytest.mark.network
 def test_http_range_requests_are_narrow(tmp_path):
     path = tmp_path / "served.parquet"
     pq.write_table(
@@ -905,6 +906,7 @@ def test_s3_parquet_smoke():
             remote[remote.col_names[0]][0]
 
 
+@pytest.mark.network
 def test_http_without_range_support_fails_clearly(tmp_path):
     path = tmp_path / "large.parquet"
     pq.write_table(pa.table({"x": list(range(20_000))}), path, row_group_size=1_000)

tests/ndarray/test_c2array_blocks.py

@@ -35,10 +35,13 @@
 # with it rather than raising.  Windows serves the same stand-in badly -- a
 # client abort (WinError 10053) can leave an in-process server wedging the
 # xdist worker -- and serving HTTP from Windows is not what this suite covers.
-pytestmark = pytest.mark.skipif(
-    blosc2.IS_WASM or sys.platform == "win32",
-    reason="in-process HTTP servers not supported on wasm32 or Windows",
-)
+pytestmark = [
+    pytest.mark.network,
+    pytest.mark.skipif(
+        blosc2.IS_WASM or sys.platform == "win32",
+        reason="in-process HTTP servers not supported on wasm32 or Windows",
+    ),
+]
 
 
 class _Cat2Server:

tests/ndarray/test_c2array_writes.py

@@ -34,10 +34,13 @@
 # The stand-in binds a real socket, which wasm32 has no listen(2) for, and
 # Windows serves badly enough to wedge an xdist worker (see
 # test_c2array_blocks.py); neither platform is tested as a server here.
-pytestmark = pytest.mark.skipif(
-    blosc2.IS_WASM or sys.platform == "win32",
-    reason="in-process HTTP servers not supported on wasm32 or Windows",
-)
+pytestmark = [
+    pytest.mark.network,
+    pytest.mark.skipif(
+        blosc2.IS_WASM or sys.platform == "win32",
+        reason="in-process HTTP servers not supported on wasm32 or Windows",
+    ),
+]
 
 CHUNKS = (1000,)
 BLOCKS = (250,)

tests/test_b2z_source.py

@@ -299,6 +299,7 @@ def counted(self, path, start=None, end=None, **kwargs):
 @pytest.mark.parametrize("small", [False, True])
 @pytest.mark.parametrize("ctable", [False, True])
 @pytest.mark.usefixtures("b2z_range_reads")
+@pytest.mark.network
 def test_http_tail_bootstrap(suffix, small, ctable, tmp_path):
     import http.server
     import threading

tests/test_fsspec.py

@@ -645,6 +645,7 @@ def test_unknown_protocol():
 
 @_http_server_skip
 @pytest.mark.skipif(blosc2.IS_WASM, reason="no listening sockets on wasm32")
+@pytest.mark.network
 def test_http_url_is_read_through_fsspec(tmp_path):
     # A frame behind a plain web server -- no Caterva2 there to ask anything of --
     # is a frame like any other: fsspec reads it in ranges wherever the server
@@ -673,6 +674,7 @@ def test_http_url_is_read_through_fsspec(tmp_path):
 
 @_http_server_skip
 @pytest.mark.skipif(blosc2.IS_WASM, reason="no listening sockets on wasm32")
+@pytest.mark.network
 def test_http_shared_b2nd_cache_across_processes(tmp_path):
     pytest.importorskip("aiohttp")
     blosc2.asarray(
@@ -704,6 +706,7 @@ def test_http_shared_b2nd_cache_across_processes(tmp_path):
 
 
 @_http_server_skip
+@pytest.mark.network
 def test_http_lazy_cache_rebuilt_when_remote_changes(tmp_path):
     pytest.importorskip("aiohttp")
     path = tmp_path / "www"
@@ -726,6 +729,7 @@ def test_http_lazy_cache_rebuilt_when_remote_changes(tmp_path):
 
 
 @_http_server_skip
+@pytest.mark.network
 def test_http_remote_array_checks_identity_without_refetching_cached_data(tmp_path):
     pytest.importorskip("aiohttp")
     path = tmp_path / "www"
@@ -814,6 +818,7 @@ def do_HEAD(self):
         server.server_close()
 
 
+@pytest.mark.network
 def test_http_hdf5_scan_and_warm_slice(tmp_path):
     h5py = pytest.importorskip("h5py")
     data = np.arange(10_000, dtype="int32")
@@ -830,6 +835,7 @@ def test_http_hdf5_scan_and_warm_slice(tmp_path):
 
 
 @pytest.mark.parametrize("format", ["hdf5", "b2z"])
+@pytest.mark.network
 def test_http_source_cache_across_processes(tmp_path, format):
     data = np.zeros(100, dtype=[("id", "i4"), ("value", "f8")])
     data["id"] = np.arange(len(data))
@@ -881,6 +887,7 @@ def test_http_source_cache_across_processes(tmp_path, format):
         assert head_requests == []
 
 
+@pytest.mark.network
 def test_http_large_hdf5_keeps_range_reads(tmp_path):
     h5py = pytest.importorskip("h5py")
     path = tmp_path / "large-seekable.h5"
@@ -893,6 +900,7 @@ def test_http_large_hdf5_keeps_range_reads(tmp_path):
         assert all(request is not None for request in requests)
 
 
+@pytest.mark.network
 def test_http_hdf5_source_close_closes_session(tmp_path):
     h5py = pytest.importorskip("h5py")
     data = np.arange(10_000, dtype="int32")
@@ -923,6 +931,7 @@ def test_http_hdf5_source_close_closes_session(tmp_path):
             sparse.get_chunk(0)
 
 
+@pytest.mark.network
 def test_http_hdf5_scan_closes_owned_session(tmp_path, monkeypatch):
     h5py = pytest.importorskip("h5py")
     import blosc2.hdf5_source as hdf5_source
@@ -947,6 +956,7 @@ def tracking(urlpath, storage_options=None, filesystem=None):
         assert created[0]._session.closed
 
 
+@pytest.mark.network
 def test_http_hdf5_failed_init_closes_owned_session(tmp_path, monkeypatch):
     h5py = pytest.importorskip("h5py")
     import blosc2.hdf5_source as hdf5_source
@@ -978,6 +988,7 @@ def tracking(urlpath, storage_options=None, filesystem=None):
         assert created[1]._session.closed
 
 
+@pytest.mark.network
 def test_http_hdf5_source_finalizer_closes_session(tmp_path):
     h5py = pytest.importorskip("h5py")
     data = np.arange(10_000, dtype="int32")
@@ -993,6 +1004,7 @@ def test_http_hdf5_source_finalizer_closes_session(tmp_path):
         assert session.closed
 
 
+@pytest.mark.network
 def test_http_store_disk_reopen_and_transport_close(tmp_path):
     h5py = pytest.importorskip("h5py")
     data = np.arange(10_000, dtype="int32")

tests/test_fsspec_s3.py

@@ -18,8 +18,8 @@
 - it is poorer in metadata than any real store (no mtime), which let a
   size-only cache stamp serve a stale chunk cache.
 
-These run offline -- moto is a local server, no credentials, no network -- so
-they are not marked ``network``.
+These need no external service or credentials, but moto binds a real localhost
+socket, so they are marked ``network`` and excluded from release-time tests.
 """
 
 import asyncio
@@ -29,6 +29,8 @@
 
 import blosc2
 
+pytestmark = pytest.mark.network
+
 pytest.importorskip("s3fs")
 pytest.importorskip("moto")
 fsspec = pytest.importorskip("fsspec")

tests/test_hdf5_source.py

@@ -1268,6 +1268,7 @@ def s3_server():
     server.stop()
 
 
+@pytest.mark.network
 def test_moto_s3_hdf5_read(s3_server):
     s3_opts = {
         "endpoint_url": s3_server,
@@ -1292,6 +1293,7 @@ def test_moto_s3_hdf5_read(s3_server):
     np.testing.assert_array_equal(proxy[:], data)
 
 
+@pytest.mark.network
 def test_moto_s3_hdf5_caching(s3_server, tmp_path):
     s3_opts = {
         "endpoint_url": s3_server,

tests/test_network_hook.py

@@ -0,0 +1,42 @@
+"""Regression tests for optional-network test execution."""
+
+from types import SimpleNamespace
+
+import httpx
+import pytest
+
+from conftest import pytest_runtest_call
+
+
+@pytest.mark.parametrize("network", [False, True])
+def test_network_hook_leaves_execution_to_pytest(network):
+    def unexpected_run():
+        raise AssertionError("the hook must not execute the test a second time")
+
+    item = SimpleNamespace(
+        get_closest_marker=lambda name: pytest.mark.network if network else None,
+        runtest=unexpected_run,
+    )
+    hook = pytest_runtest_call(item)
+    assert next(hook) is None
+    with pytest.raises(StopIteration) as finished:
+        hook.send("test result")
+    assert finished.value.value == "test result"
+
+
+@pytest.mark.parametrize("network", [False, True])
+def test_network_hook_only_skips_marked_transport_errors(network):
+    item = SimpleNamespace(get_closest_marker=lambda name: pytest.mark.network if network else None)
+    hook = pytest_runtest_call(item)
+    next(hook)
+    expected = pytest.skip.Exception if network else httpx.ReadTimeout
+    with pytest.raises(expected):
+        hook.throw(httpx.ReadTimeout("endpoint unavailable"))
+
+
+def test_network_hook_does_not_hide_assertion_failures():
+    item = SimpleNamespace(get_closest_marker=lambda name: pytest.mark.network)
+    hook = pytest_runtest_call(item)
+    next(hook)
+    with pytest.raises(AssertionError, match="regression"):
+        hook.throw(AssertionError("regression"))