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

All tests except tests/pytests/{scenarios,pkg} timeout at 60 seconds

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2024-01-22 17:58:48 +00:00 • committed by Pedro Algarvio
parent 022f73aa7c
commit 5d96fdcad2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/conftest.py
View file

@ -447,13 +447,13 @@ def pytest_collection_modifyitems(config, items):
log.warning("Mofifying collected tests to keep track of fixture usage")
timeout_marker_tests_paths = (
str(TESTS_DIR / "unit"),
str(PYTESTS_DIR / "unit"),
str(PYTESTS_DIR / "pkg"),
str(PYTESTS_DIR / "scenarios"),
)
for item in items:
if (
not salt.utils.platform.is_windows()
and str(pathlib.Path(item.fspath).resolve()).startswith(
and not str(pathlib.Path(item.fspath).resolve()).startswith(
timeout_marker_tests_paths
)
and not item.get_closest_marker("timeout")