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

Removed more support for classic packages, adjust handling of '--no-install'

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

15
noxfile.py
View file

@ -1833,18 +1833,10 @@ def ci_test_onedir_pkgs(session):
"--upgrade",
"--no-uninstall",
],
"upgrade-classic": [
"--upgrade",
"--no-uninstall",
],
"downgrade": [
"--downgrade",
"--no-uninstall",
],
"downgrade-classic": [
"--downgrade",
"--no-uninstall",
],
"download-pkgs": [
"--download-pkgs",
],
@ -1875,9 +1867,6 @@ def ci_test_onedir_pkgs(session):
"PKG_TEST_TYPE": chunk,
}
if chunk in ("upgrade-classic", "downgrade-classic"):
cmd_args.append("--classic")
pytest_args = (
common_pytest_args[:]
+ cmd_args[:]
@ -1945,8 +1934,6 @@ def ci_test_onedir_pkgs(session):
)
if "downgrade" in chunk:
pytest_args.append("--use-prev-version")
if chunk in ("upgrade-classic", "downgrade-classic"):
pytest_args.append("--classic")
if append_tests_path:
pytest_args.append("tests/pytests/pkg/")
try:
@ -1969,8 +1956,6 @@ def ci_test_onedir_pkgs(session):
)
if "downgrade" in chunk:
pytest_args.append("--use-prev-version")
if chunk in ("upgrade-classic", "downgrade-classic"):
pytest_args.append("--classic")
if append_tests_path:
pytest_args.append("tests/pytests/pkg/")
_pytest(

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

@ -90,12 +90,6 @@ def pytest_addoption(parser):
action="store_true",
help="Do not uninstall salt packages after test run is complete",
)
test_selection_group.addoption(
"--classic",
default=False,
action="store_true",
help="Test an upgrade from the classic packages.",
)
test_selection_group.addoption(
"--prev-version",
action="store",
@ -231,7 +225,7 @@ 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"),
classic=request.config.getoption("--classic"),
## DGM classic=request.config.getoption("--classic"),
prev_version=request.config.getoption("--prev-version"),
use_prev_version=request.config.getoption("--use-prev-version"),
) as fixture:

4
tests/pytests/pkg/integration/test_enabled_disabled.py
View file

@ -7,8 +7,8 @@ def test_services(install_salt, salt_call_cli):
"""
Check if Services are enabled/disabled
"""
## DGM if not install_salt.upgrade:
## DGM install_salt.install()
if not install_salt.upgrade:
install_salt.install()
services_disabled = []
services_enabled = []

8
tests/pytests/pkg/integration/test_version.py
View file

@ -11,8 +11,8 @@ def test_salt_version(version, install_salt):
"""
Test version output from salt --version
"""
## DGM if install_salt.upgrade:
## DGM install_salt.install()
if install_salt.upgrade:
install_salt.install()
test_bin = os.path.join(*install_salt.binary_paths["salt"])
ret = install_salt.proc.run(test_bin, "--version")
@ -74,8 +74,8 @@ def test_compare_versions(version, binary, install_salt):
Test compare versions
"""
if binary in install_salt.binary_paths:
## DGM if install_salt.upgrade:
## DGM install_salt.install()
if install_salt.upgrade:
install_salt.install()
ret = install_salt.proc.run(
*install_salt.binary_paths[binary],

3
tests/support/pkg.py
View file

@ -1009,7 +1009,10 @@ class SaltPkgInstall:
if self.upgrade:
self.install_previous()
else:
# assume downgrade, since no_install only used in these two cases
self.install()
else:
self.install()
return self
def __exit__(self, *_):