saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix Fast Tests

Browse source
This commit is contained in:
Charles McMarrow 2023-06-28 11:13:45 -05:00 • committed by Pedro Algarvio
parent 1f8dc3c510
commit a7b178beca
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/conftest.py
View file

@ -578,7 +578,7 @@ def pytest_runtest_setup(item):
item._skipped_by_mark = True
pytest.skip(PRE_PYTEST_SKIP_REASON)
test_group_count = sum(
bool(item.get_closest_marker(group)) for group in ("core_test", "slow_test")
bool(item.get_closest_marker(group)) for group in ("core_test", "slow_test", "flaky_jail")
)
if item.get_closest_marker("core_test") and item.get_closest_marker("slow_test"):
raise pytest.UsageError(
@ -604,7 +604,7 @@ def pytest_runtest_setup(item):
"Slow tests are disabled, pass '--run-slow' to enable them.",
_use_item_location=True,
)
if test_group_count == 0 and not item.config.getoption("--no-fast-tests"):
if test_group_count == 0 and item.config.getoption("--no-fast-tests"):
raise pytest.skip.Exception(
"Fast tests have been disabled by '--no-fast-tests'.",
_use_item_location=True,