Minor timeout adjustments

tests/integration/cli/test_custom_module.py

@@ -61,7 +61,7 @@ class SSHCustomModuleTest(SSHCase):
         self.assertEqual(expected, cmd)
 
     @pytest.mark.slow_test
-    @pytest.mark.timeout(120)
+    @pytest.mark.timeout(120, func_only=True)
     def test_ssh_custom_module(self):
         """
         Test custom module work using SSHCase environment

tests/integration/modules/test_localemod.py

@@ -27,7 +27,7 @@ class LocaleModuleTest(ModuleCase):
         locale = self.run_function("locale.get_locale")
         self.assertNotIn("Unsupported platform!", locale)
 
-    @pytest.mark.timeout(120)
+    @pytest.mark.timeout_unless_on_windows(120)
     @pytest.mark.destructive_test
     @pytest.mark.slow_test
     def test_gen_locale(self):

tests/pytests/functional/modules/state/requisites/test_unless.py

@@ -3,10 +3,10 @@ import pytest
 pytestmark = [
     pytest.mark.windows_whitelisted,
     pytest.mark.core_test,
+    pytest.mark.timeout_unless_on_windows(120),
 ]
 
 
-@pytest.mark.timeout(120)
 def test_unless_req(state):
     ret = state.single(fun="test.succeed_with_changes", name="unless test", unless=[{}])
     assert ret.result is True
@@ -36,7 +36,6 @@ def test_unless_req(state):
     assert ret.comment == "Success!"
 
 
-@pytest.mark.timeout(120)
 def test_unless_req_retcode(state):
     ret = state.single(
         fun="test.succeed_with_changes",

tests/pytests/functional/modules/test_mac_brew_pkg.py

@@ -7,7 +7,7 @@ import pytest
 
 pytestmark = [
     pytest.mark.slow_test,
-    pytest.mark.timeout(120),
+    pytest.mark.timeout(120, func_only=True),
     pytest.mark.destructive_test,
     pytest.mark.skip_if_not_root,
     pytest.mark.skip_unless_on_darwin,

tests/pytests/functional/modules/test_mac_pkgutil.py

@@ -9,7 +9,7 @@ import pytest
 from salt.exceptions import SaltInvocationError
 
 pytestmark = [
-    pytest.mark.timeout(120),
+    pytest.mark.timeout(120, func_only=True),
     pytest.mark.slow_test,
     pytest.mark.destructive_test,
     pytest.mark.skip_if_not_root,

tests/pytests/functional/modules/test_mac_softwareupdate.py

@@ -8,7 +8,7 @@ from salt.exceptions import SaltInvocationError
 
 pytestmark = [
     pytest.mark.slow_test,
-    pytest.mark.timeout(240),
+    pytest.mark.timeout(240, func_only=True),
     pytest.mark.skip_if_binaries_missing("softwareupdate"),
     pytest.mark.skip_if_not_root,
     pytest.mark.skip_unless_on_darwin,

tests/pytests/unit/grains/test_core.py

@@ -2326,7 +2326,7 @@ def test_fqdns_return():
 
 
 @pytest.mark.skip_unless_on_linux
-@pytest.mark.timeout(60)
+@pytest.mark.timeout(60, func_only=True)
 def test_fqdns_socket_error(caplog):
     """
     test the behavior on non-critical socket errors of the dns grain

tests/pytests/unit/utils/test_aws.py

@@ -22,7 +22,7 @@ pytestmark = [
     # Skip testing on windows since it does not support signal.SIGALRM
     # which is what the timeout marker is using by default.
     pytest.mark.skip_on_windows,
-    pytest.mark.timeout(60, method=DEFAULT_METHOD),
+    pytest.mark.timeout(60, method=DEFAULT_METHOD, func_only=True),
 ]