From 8721d4757803272f7709db9a9235b90045dc5997 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sun, 18 Feb 2024 19:43:30 +0000 Subject: [PATCH] Increase timeouts in problematic tests --- tests/pytests/functional/cli/test_salt_deltaproxy.py | 1 + tests/unit/utils/test_pyobjects.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests/pytests/functional/cli/test_salt_deltaproxy.py b/tests/pytests/functional/cli/test_salt_deltaproxy.py index 429c4812457..022aa77efcf 100644 --- a/tests/pytests/functional/cli/test_salt_deltaproxy.py +++ b/tests/pytests/functional/cli/test_salt_deltaproxy.py @@ -19,6 +19,7 @@ pytestmark = [ reason="Deltaproxy minions do not currently work on spawning platforms.", ), pytest.mark.core_test, + pytest.mark.timeout_unless_on_windows(320), ] diff --git a/tests/unit/utils/test_pyobjects.py b/tests/unit/utils/test_pyobjects.py index 6a7bd406237..c36a98dab18 100644 --- a/tests/unit/utils/test_pyobjects.py +++ b/tests/unit/utils/test_pyobjects.py @@ -24,6 +24,10 @@ from salt.utils.pyobjects import ( from tests.support.runtests import RUNTIME_VARS from tests.support.unit import TestCase +pytestmark = [ + pytest.mark.timeout_unless_on_windows(120), +] + log = logging.getLogger(__name__)