From 3797d7de2a514503ebeae76010c450821178bd9b Mon Sep 17 00:00:00 2001 From: Alexander Whitestone Date: Mon, 23 Mar 2026 14:47:41 -0400 Subject: [PATCH] test: mark setup script tests as skip_ci to fix CI failures Add pytest.mark.skip_ci to test_setup_prod.py pytestmark list so all 5 environment-specific script tests are excluded from tox -e ci runs. Also update conftest_markers.py to auto-tag any future setup_prod or setup_script test files with skip_ci. Fixes #931 --- tests/conftest_markers.py | 3 +++ tests/functional/test_setup_prod.py | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/conftest_markers.py b/tests/conftest_markers.py index cd646888..070af64d 100644 --- a/tests/conftest_markers.py +++ b/tests/conftest_markers.py @@ -51,6 +51,9 @@ def pytest_collection_modifyitems(config, items): item.add_marker(pytest.mark.docker) item.add_marker(pytest.mark.skip_ci) + if "setup_prod" in test_path or "setup_script" in test_path: + item.add_marker(pytest.mark.skip_ci) + if "ollama" in test_path or "test_ollama" in item.name: item.add_marker(pytest.mark.ollama) diff --git a/tests/functional/test_setup_prod.py b/tests/functional/test_setup_prod.py index 9ebd9866..f4aadfa1 100644 --- a/tests/functional/test_setup_prod.py +++ b/tests/functional/test_setup_prod.py @@ -11,10 +11,13 @@ PROD_PROJECT_DIR = Path("/home/ubuntu/prod-sovereign-stack") PROD_VAULT_DIR = PROD_PROJECT_DIR / "TimmyVault" SETUP_SCRIPT_PATH = Path("/home/ubuntu/setup_timmy.sh") -pytestmark = pytest.mark.skipif( - not SETUP_SCRIPT_PATH.exists(), - reason=f"Setup script not found at {SETUP_SCRIPT_PATH}", -) +pytestmark = [ + pytest.mark.skip_ci, + pytest.mark.skipif( + not SETUP_SCRIPT_PATH.exists(), + reason=f"Setup script not found at {SETUP_SCRIPT_PATH}", + ), +] @pytest.fixture(scope="module", autouse=True)