Fix salt-ssh tests with newer Python

cicd/shared-gh-workflows-context.yml

@@ -7,11 +7,13 @@ release_branches:
 pr-testrun-slugs:
   - ubuntu-24.04-pkg
   - ubuntu-24.04
-  - rockylinux-9
-  - rockylinux-9-pkg
-  - windows-2025
-  - windows-2025-pkg
-  - macos-15
-  - macos-15-pkg
+#  - rockylinux-9
+#  - rockylinux-9-pkg
+  - fedora-42
+  - fedora-42-pkg
+#  - windows-2025
+#  - windows-2025-pkg
+#  - macos-15
+#  - macos-15-pkg
 full-testrun-slugs:
   - all

tests/pytests/integration/netapi/test_ssh_client.py

@@ -12,10 +12,10 @@
 from tests.support.mock import patch
 
 pytestmark = [
-    pytest.mark.slow_test,
+    # pytest.mark.slow_test,
     pytest.mark.requires_sshd_server,
     pytest.mark.skipif(
-        'grains["osfinger"].startswith(("Fedora Linux-40", "Ubuntu-24.04", "Arch Linux"))',
+        'grains["osfinger"].startswith(("Arch Linux"))',
         reason="System ships with a version of python that is too recent for salt-ssh tests",
         # Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
         # and it imports `ssl` and checks if the `match_hostname` function is defined, which

tests/pytests/integration/ssh/conftest.py

@@ -6,10 +6,7 @@
 
 @pytest.fixture(scope="package", autouse=True)
 def _auto_skip_on_system_python_too_recent(grains):
-    if (
-        grains["osfinger"] in ("Fedora Linux-40", "Ubuntu-24.04", "Debian-13")
-        or grains["os_family"] == "Arch"
-    ):
+    if grains["os_family"] == "Arch":
         pytest.skip(
             "System ships with a version of python that is too recent for salt-ssh tests",
             # Actually, the problem is that the tornado we ship is not prepared for Python 3.12,

tests/pytests/integration/ssh/state/test_pillar_override.py

@@ -13,7 +13,7 @@
 pytestmark = [
     pytest.mark.skip_on_windows(reason="salt-ssh not available on Windows"),
     pytest.mark.usefixtures("pillar_tree_nested"),
-    pytest.mark.slow_test,
+    # pytest.mark.slow_test,
 ]
 
 

tests/pytests/integration/ssh/state/test_state.py

@@ -2,7 +2,7 @@
 
 pytestmark = [
     pytest.mark.skip_on_windows(reason="salt-ssh not available on Windows"),
-    pytest.mark.slow_test,
+    # pytest.mark.slow_test,
 ]
 
 

tools/ci.py

@@ -572,6 +572,7 @@ def _os_test_filter(osdef, transport, chunk, arm_runner, requested_slugs):
         "photonos-5-arm64",
         "ubuntu-22.04",
         "ubuntu-22.04-arm64",
+        "fedora-42",
     ):
         return False
     return True

tools/precommit/workflows.py

@@ -89,10 +89,10 @@
                 container="ghcr.io/saltstack/salt-ci-containers/testing:debian-13",
             ),
             Linux(
-                slug="fedora-40",
-                display_name="Fedora 40",
+                slug="fedora-42",
+                display_name="Fedora 42",
                 arch="x86_64",
-                container="ghcr.io/saltstack/salt-ci-containers/testing:fedora-40",
+                container="ghcr.io/saltstack/salt-ci-containers/testing:fedora-42",
             ),
             # Linux(slug="opensuse-15", display_name="Opensuse 15", arch="x86_64"),
             Linux(