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
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user