Skip ssh tests when system pytho too old.

Author: dwoz

tests/integration/cli/test_custom_module.py

@@ -32,6 +32,7 @@ def recho(text):
 import pytest
 
 from tests.support.case import SSHCase
+from tests.support.helpers import system_python_version
 
 pytestmark = [
     pytest.mark.skip_on_windows,
@@ -43,6 +44,10 @@ def recho(text):
         # has been deprecated since Python 3.7, so, the logic goes into trying to import
         # backports.ssl-match-hostname which is not installed on the system.
     ),
+    pytest.mark.skipif(
+        system_python_version() < (3, 10),
+        reason="System python too old for these tests",
+    ),
 ]
 
 

tests/integration/ssh/test_state.py

@@ -9,6 +9,7 @@
 from saltfactories.utils.tempfiles import temp_file
 
 from tests.support.case import SSHCase
+from tests.support.helpers import system_python_version
 from tests.support.runtests import RUNTIME_VARS
 
 pytestmark = [
@@ -22,6 +23,10 @@
         # has been deprecated since Python 3.7, so, the logic goes into trying to import
         # backports.ssl-match-hostname which is not installed on the system.
     ),
+    pytest.mark.skipif(
+        system_python_version() < (3, 10),
+        reason="System python too old for these tests",
+    ),
 ]
 
 SSH_SLS = "ssh_state_tests"

tests/pytests/integration/netapi/test_ssh_client.py

@@ -4,7 +4,11 @@
 
 import salt.netapi
 from salt.exceptions import EauthAuthenticationError, SaltInvocationError
-from tests.support.helpers import SaveRequestsPostHandler, Webserver
+from tests.support.helpers import (
+    SaveRequestsPostHandler,
+    Webserver,
+    system_python_version,
+)
 from tests.support.mock import patch
 
 pytestmark = [
@@ -18,6 +22,10 @@
         # has been deprecated since Python 3.7, so, the logic goes into trying to import
         # backports.ssl-match-hostname which is not installed on the system.
     ),
+    pytest.mark.skipif(
+        system_python_version() < (3, 10),
+        reason="System python too old for these tests",
+    ),
     pytest.mark.timeout_unless_on_windows(120),
 ]
 

tests/pytests/integration/ssh/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 
+from tests.support.helpers import system_python_version
 from tests.support.pytest.helpers import reap_stray_processes
 
 
@@ -16,6 +17,8 @@ def _auto_skip_on_system_python_too_recent(grains):
             # has been deprecated since Python 3.7, so, the logic goes into trying to import
             # backports.ssl-match-hostname which is not installed on the system.
         )
+    if system_python_version() < (3, 10):
+        pytest.skip("System python too old for these tests")
 
 
 @pytest.fixture(autouse=True)

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

@@ -6,9 +6,14 @@
 import pytest
 
 from salt.defaults.exitcodes import EX_AGGREGATE
+from tests.support.helpers import system_python_version
 
 pytestmark = [
     pytest.mark.skip_on_windows(reason="salt-ssh not available on Windows"),
+    pytest.mark.skipif(
+        system_python_version() < (3, 10),
+        reason="System python too old for these tests",
+    ),
     pytest.mark.slow_test,
 ]
 

tests/support/helpers.py

@@ -1904,3 +1904,15 @@ def __enter__(self):
 
     def __exit__(self, *_):
         shutil.rmtree(str(self.priv_path.parent), ignore_errors=True)
+
+
+@functools.cache
+def system_python_version():
+    if salt.utils.platform.is_windows():
+        binary = "python3.exe"
+    else:
+        binary = "/usr/bin/python3"
+    proc = subprocess.run([binary, "--version"], capture_output=True, check=True)
+    return tuple(
+        int(_) for _ in proc.stdout.decode().split(" ", 1)[1].strip().split(".")
+    )