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 2

Merge pull request #63906 from s0undt3ch/hotfix/rc-fixes

Browse source 
[3006.x] Adjust test for expected reproduceability
This commit is contained in:
Pedro Algarvio 2023-03-19 12:28:48 +00:00 • committed by GitHub
commit 1f84284226
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkg/tests/support/helpers.py
View file

@ -61,12 +61,12 @@ log = logging.getLogger(__name__)
class SaltPkgInstall:
conf_dir: pathlib.Path = attr.ib()
system_service: bool = attr.ib(default=False)
proc: Subprocess = attr.ib(init=False)
proc: Subprocess = attr.ib(init=False, repr=False)
pkgs: List[str] = attr.ib(factory=list)
onedir: bool = attr.ib(default=False)
singlebin: bool = attr.ib(default=False)
compressed: bool = attr.ib(default=False)
hashes: Dict[str, Dict[str, Any]] = attr.ib()
hashes: Dict[str, Dict[str, Any]] = attr.ib(repr=False)
root: pathlib.Path = attr.ib(default=None)
run_root: pathlib.Path = attr.ib(default=None)
ssm_bin: pathlib.Path = attr.ib(default=None)
@ -91,7 +91,7 @@ class SaltPkgInstall:
classic: bool = attr.ib(default=False)
prev_version: str = attr.ib()
pkg_version: str = attr.ib(default="1")
repo_data: str = attr.ib(init=False)
repo_data: str = attr.ib(init=False, repr=False)
major: str = attr.ib(init=False)
minor: str = attr.ib(init=False)
relenv: bool = attr.ib(default=True)

2
pkg/tests/upgrade/test_salt_upgrade.py
View file

@ -13,7 +13,7 @@ def test_salt_upgrade(salt_call_cli, salt_minion, install_salt):
assert ret.data
# test pip install before an upgrade
dep = "PyGithub"
dep = "PyGithub==1.56.0"
repo = "https://github.com/saltstack/salt.git"
install = salt_call_cli.run("--local", "pip.install", dep)
assert install.returncode == 0