Address review comments, hiding non-important fixtures and removing a basically blank method

This commit is contained in:
MKLeb 2023-09-08 15:14:40 -04:00 committed by Pedro Algarvio
parent b52f1b3b60
commit d9bfb7b7bb
4 changed files with 4 additions and 9 deletions

View file

@ -13,7 +13,7 @@ log = logging.getLogger(__name__)
@pytest.fixture(autouse=True)
def skip_on_non_relenv(install_salt):
def _skip_on_non_relenv(install_salt):
if not install_salt.relenv:
pytest.skip("This test is for relenv versions of salt")

View file

@ -12,7 +12,7 @@ pytestmark = [
@pytest.fixture(autouse=True)
def skip_on_less_than_3006_1(install_salt):
def _skip_on_less_than_3006_1(install_salt):
if packaging.version.parse(install_salt.version) <= packaging.version.parse(
"3006.1"
):

View file

@ -61,7 +61,7 @@ def pkg_paths_salt_user_exclusions():
@pytest.fixture(autouse=True)
def skip_on_non_relenv(install_salt):
def _skip_on_non_relenv(install_salt):
if not install_salt.relenv:
pytest.skip("The salt user only exists on relenv versions of salt")

View file

@ -216,7 +216,7 @@ class SaltPkgInstall:
if platform.is_windows():
file_ext_re = "exe|msi"
for f_path in ARTIFACTS_DIR.glob("**/*.*"):
for f_path in ARTIFACTS_DIR.rglob("."):
f_path = str(f_path)
if re.search(f"salt-(.*).({file_ext_re})$", f_path, re.IGNORECASE):
self.file_ext = os.path.splitext(f_path)[1].strip(".")
@ -1224,11 +1224,6 @@ class PkgMixin:
return str(self.salt_pkg_install.install_dir / self.script_name)
return super().get_script_path()
def get_base_script_args(self):
base_script_args = []
base_script_args.extend(super().get_base_script_args())
return base_script_args
def cmdline(self, *args, **kwargs):
_cmdline = super().cmdline(*args, **kwargs)
if _cmdline[0] == self.python_executable: