diff --git a/tests/pytests/pkg/conftest.py b/tests/pytests/pkg/conftest.py index 6cbed8ab590..b5596bb4371 100644 --- a/tests/pytests/pkg/conftest.py +++ b/tests/pytests/pkg/conftest.py @@ -225,7 +225,6 @@ def install_salt(request, salt_factories_root_dir): downgrade=request.config.getoption("--downgrade"), no_uninstall=request.config.getoption("--no-uninstall"), no_install=request.config.getoption("--no-install"), - ## DGM classic=request.config.getoption("--classic"), prev_version=request.config.getoption("--prev-version"), use_prev_version=request.config.getoption("--use-prev-version"), ) as fixture: diff --git a/tests/support/pkg.py b/tests/support/pkg.py index 393e70e7b67..0d2af4abcf2 100644 --- a/tests/support/pkg.py +++ b/tests/support/pkg.py @@ -1005,14 +1005,19 @@ class SaltPkgInstall: if platform.is_windows(): self.update_process_path() - if not self.no_install: - if self.upgrade: - self.install_previous() - else: - # assume downgrade, since no_install only used in these two cases - self.install() - else: - self.install() + ## DGM if not self.no_install: + ## DGM if self.upgrade: + ## DGM self.install_previous() + ## DGM else: + ## DGM # assume downgrade, since no_install only used in these two cases + ## DGM self.install() + ## DGM else: + ## DGM self.install() + + # DGM Hate the use of negative flags + # if flag set, use previous version of Salt. + if self.no_install: + self.install_previous() return self def __exit__(self, *_):