saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Updated tests

Browse source
This commit is contained in:
David Murphy 2024-06-14 15:48:10 -06:00 • committed by Daniel Wozniak
parent 693053d684
commit c48a3e412c
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tests/pytests/pkg/conftest.py
View file

@ -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:

21
tests/support/pkg.py
View file

@ -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, *_):