Increase timeouts on problematic tests

tests/integration/cli/test_custom_module.py

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

tests/pytests/functional/modules/state/test_jinja_filters.py

@@ -1229,6 +1229,7 @@ def filter(request):
     return _filter
 
 
+@pytest.mark.timeout_unless_on_windows(120)
 def test_filter(state, state_tree, filter, grains):
     filter.check_skip(grains)
     with filter(state_tree):

tests/pytests/integration/modules/test_beacons.py

@@ -12,6 +12,7 @@ from tests.support.helpers import PRE_PYTEST_SKIP_OR_NOT
 pytestmark = [
     pytest.mark.core_test,
     pytest.mark.windows_whitelisted,
+    pytest.mark.timeout_unless_on_windows(200),
 ]
 
 

tests/pytests/integration/modules/test_pillar.py

@@ -395,6 +395,7 @@ def test_pillar_refresh_pillar_ping(salt_cli, salt_minion, key_pillar):
 
 
 @pytest.mark.slow_test
+@pytest.mark.timeout_unless_on_windows(120)
 def test_pillar_refresh_pillar_scheduler(salt_master, salt_cli, salt_minion):
     """
     Ensure schedule jobs in pillar are only updated when values change.

tests/pytests/integration/modules/test_x509_v2.py

@@ -452,6 +452,7 @@ def x509_salt_call_cli(x509_salt_minion):
     return x509_salt_minion.salt_call_cli()
 
 
+@pytest.mark.timeout_unless_on_windows(120)
 def test_sign_remote_certificate(x509_salt_call_cli, cert_args, ca_key, rsa_privkey):
     ret = x509_salt_call_cli.run("x509.create_certificate", **cert_args)
     assert ret.data

tests/pytests/integration/runners/state/orchestrate/test_events.py

@@ -419,6 +419,7 @@ def test_orchestration_onchanges_and_prereq(
 @pytest.mark.skip_if_not_root
 @pytest.mark.skip_on_windows
 @pytest.mark.skip_on_darwin
+@pytest.mark.timeout_unless_on_windows(120)
 def test_unknown_in_runner_event(
     runner_salt_run_cli,
     runner_salt_master,

tests/pytests/integration/runners/test_vault.py

@@ -12,6 +12,7 @@ log = logging.getLogger(__name__)
 
 pytestmark = [
     pytest.mark.slow_test,
+    pytest.mark.timeout_unless_on_windows(120),
 ]
 
 

tests/pytests/integration/states/test_ansiblegate.py

@@ -65,7 +65,7 @@ def ansible_inventory(ansible_inventory_directory, sshd_server):
 
 
 @pytest.mark.requires_sshd_server
-@pytest.mark.timeout_unless_on_windows(120)
+@pytest.mark.timeout_unless_on_windows(240)
 def test_ansible_playbook(salt_call_cli, ansible_inventory, tmp_path):
     rundir = tmp_path / "rundir"
     rundir.mkdir(exist_ok=True, parents=True)

tests/pytests/integration/states/test_beacon.py

@@ -9,6 +9,7 @@ log = logging.getLogger(__name__)
 
 
 @pytest.mark.slow_test
+@pytest.mark.timeout_unless_on_windows(120)
 def test_present_absent(salt_master, salt_minion, salt_call_cli):
     ret = salt_call_cli.run("beacons.reset")