Salt >= 3006.3 now reports the version name on --version

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>

Author: s0undt3ch

tests/conftest.py

@@ -121,6 +121,16 @@ def salt_version():
     return pkg_version("salt")
 
 
+@pytest.fixture(scope="session")
+def salt_version_info():
+    return pkg_version_info("salt")
+
+
+@pytest.fixture(scope="session")
+def salt_version_name(salt_version):
+    return salt.version.SaltStackVersion.parse(str(salt_version)).name
+
+
 def pytest_collection_modifyitems(items):
     system_service_skip_paths = (
         # There's no point on running these tests against a system install of salt

tests/functional/factories/cli/conftest.py

@@ -38,3 +38,11 @@ def salt_proxy_minion(salt_master, proxy_minion_id):
     This fixture just configures a salt-minion. It does not start one.
     """
     return salt_master.salt_proxy_minion_daemon(proxy_minion_id)
+
+
+@pytest.fixture(scope="session")
+def cli_salt_version(salt_version, salt_version_info, salt_version_name):
+    _salt_version = f"{salt_version}"
+    if salt_version_info >= (3006, 3):
+        _salt_version += f" ({salt_version_name})"
+    return _salt_version

tests/functional/factories/cli/test_call.py

@@ -4,12 +4,12 @@
 import pathlib
 
 
-def test_version_info(salt_minion, salt_proxy_minion, salt_version):
+def test_version_info(salt_minion, salt_proxy_minion, cli_salt_version):
     cli = salt_minion.salt_call_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"
     cli = salt_proxy_minion.salt_call_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"

tests/functional/factories/cli/test_cloud.py

@@ -4,8 +4,8 @@
 import pathlib
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_cloud_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"

tests/functional/factories/cli/test_cp.py

@@ -4,8 +4,8 @@
 import pathlib
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_cp_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"

tests/functional/factories/cli/test_key.py

@@ -4,8 +4,8 @@
 import pathlib
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_key_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"

tests/functional/factories/cli/test_run.py

@@ -4,8 +4,8 @@
 import pathlib
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_run_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"

tests/functional/factories/cli/test_salt.py

@@ -4,8 +4,8 @@
 import pathlib
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"

tests/functional/factories/cli/test_spm.py

@@ -28,11 +28,11 @@ def spm_formulas_dir(salt_master):
         yield salt_master.state_tree.base.write_path / "formulas"
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_spm_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"
 
 
 def test_build_and_install(salt_master, spm_formulas_dir):

tests/functional/factories/cli/test_ssh.py

@@ -4,8 +4,8 @@
 import pathlib
 
 
-def test_version_info(salt_master, salt_version):
+def test_version_info(salt_master, cli_salt_version):
     cli = salt_master.salt_ssh_cli()
     ret = cli.run("--version")
     assert ret.returncode == 0, ret
-    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {salt_version}"
+    assert ret.stdout.strip() == f"{pathlib.Path(cli.script_name).name} {cli_salt_version}"