Skip proxy-based tests on MacOS tests

The proxy doesn't start in time 2s seem plenty.

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index cae4ff92e55b3f18224edce85614fd342e0cf09f..bac134cde5a9f8729ce569b297236d3cdd50bdad 100644 (file)
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -123,7 +123,8 @@ jobs:
       PSYCOPG_TEST_DSN: "host=127.0.0.1 user=runner dbname=postgres"
       # MacOS on GitHub Actions seems particularly slow.
       # Don't run timing-based tests as they regularly fail.
-      PYTEST_ADDOPTS: "-m 'not timing'"
+      # pproxy-based tests fail too, with the proxy not coming up in 2s.
+      PYTEST_ADDOPTS: "-m 'not timing and not proxy'"
 
     steps:
       - uses: actions/checkout@v2

diff --git a/tests/fix_proxy.py b/tests/fix_proxy.py
index ef87b6397e7e7e1c11b5b719e957a86cb7a04255..4128bcb54da5cfd704ed654e47985a9e5789d5be 100644 (file)
--- a/tests/fix_proxy.py
+++ b/tests/fix_proxy.py
@@ -12,6 +12,20 @@ from psycopg import conninfo
 logger = logging.getLogger()
 
 
+def pytest_collection_modifyitems(items):
+    for item in items:
+        if "proxy" in item.fixturenames:
+            item.add_marker(pytest.mark.proxy)
+
+
+def pytest_configure(config):
+    config.addinivalue_line(
+        "markers",
+        "proxy: the test uses pproxy (the marker is set automatically"
+        " on tests using the fixture)",
+    )
+
+
 @pytest.fixture
 def proxy(dsn):
     """Return a proxy to the --test-dsn database"""