Increase timeouts on problematic tests

tests/conftest.py

@@ -473,7 +473,7 @@ def pytest_collection_modifyitems(config, items):
             ):
                 # Let's apply the timeout marker on the test, if the marker
                 # is not already applied
-                item.add_marker(pytest.mark.timeout(60))
+                item.add_marker(pytest.mark.timeout(90))
         for fixture in item.fixturenames:
             if fixture not in item._fixtureinfo.name2fixturedefs:
                 continue

tests/pytests/integration/cli/test_salt_deltaproxy.py

@@ -581,7 +581,6 @@ def ping():
     [True, False],
     ids=["parallel_startup=True", "parallel_startup=False"],
 )
-@pytest.mark.timeout_unless_on_windows(120)
 def test_custom_proxy_module_raise_exception(
     salt_master,
     salt_cli,
@@ -712,7 +711,6 @@ def ping():
 # Hangs on Windows. You can add a timeout to the proxy.run command, but then
 # it just times out.
 @pytest.mark.skip_on_windows(reason=PRE_PYTEST_SKIP_REASON)
-@pytest.mark.timeout_unless_on_windows(180)
 @pytest.mark.parametrize(
     "parallel_startup",
     [True, False],

tests/pytests/unit/cloud/test_cloud.py

@@ -4,6 +4,10 @@ from salt.cloud import Cloud
 from salt.exceptions import SaltCloudSystemExit
 from tests.support.mock import MagicMock, patch
 
+pytestmark = [
+    pytest.mark.timeout_unless_on_windows(120),
+]
+
 
 @pytest.fixture
 def master_config(master_opts):

tests/unit/utils/test_process.py

@@ -26,6 +26,10 @@ except ImportError:
 
 log = logging.getLogger(__name__)
 
+pytestmark = [
+    pytest.mark.timeout_unless_on_windows(120),
+]
+
 
 def die(func):
     """