Some more fixes for the tiamat downgrade tests for macos

pkg/tests/integration/test_pip.py

@@ -12,8 +12,6 @@ from pytestskipmarkers.utils import platform
 def pypath():
     if platform.is_windows():
         return pathlib.Path(os.getenv("ProgramFiles"), "Salt Project", "Salt")
-    elif platform.is_darwin():
-        return pathlib.Path("/opt", "salt", "bin")
     else:
         return pathlib.Path("/opt", "saltstack", "salt", "pypath", "bin")
 

pkg/tests/integration/test_version.py

@@ -94,6 +94,8 @@ def test_symlinks_created(version, symlink, install_salt):
     """
     Test symlinks created
     """
+    if not install_salt.classic and symlink == "spm":
+        symlink = "salt-spm"
     ret = install_salt.proc.run(pathlib.Path("/usr/local/sbin") / symlink, "--version")
     ret.stdout.matcher.fnmatch_lines([f"*{version}*"])
 

pkg/tests/support/helpers.py

@@ -334,6 +334,7 @@ class SaltPkgInstall:
                     self.binary_paths["python"] = [shutil.which("salt"), "shell"]
                     if platform.is_darwin():
                         self.binary_paths["pip"] = [self.run_root, "pip"]
+                        self.binary_paths["spm"] = [shutil.which("salt-spm")]
                     else:
                         self.binary_paths["pip"] = [shutil.which("salt-pip")]