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

test: Use osrelease instead of lsb_distrib_release

Browse source 
Replace `lsb_distrib_release` by `osrelease` in the tests to avoid
needing to set the lsb_* values.

Signed-off-by: Benjamin Drung <bdrung@ubuntu.com>
This commit is contained in:
Benjamin Drung 2022-11-19 16:15:48 +01:00 • committed by Megan Wilhite
parent a2ec4f0727
commit 13d4751270
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/pytests/functional/states/pkgrepo/test_debian.py
View file

@ -622,7 +622,7 @@ class Repo:
"""
if (
self.grains["osfullname"] == "Ubuntu"
and self.grains["lsb_distrib_release"] == "22.04"
and self.grains["osrelease"] == "22.04"
):
return True
return False
@ -659,7 +659,7 @@ class Repo:
)
repo_content = "deb {opts} https://repo.saltproject.io/py3/{}/{}/{arch}/latest {} main".format(
self.fullname,
self.grains["lsb_distrib_release"],
self.grains["osrelease"],
self.grains["oscodename"],
arch=self.grains["osarch"],
opts=opts,
@ -669,7 +669,7 @@ class Repo:
@key_url.default
def _default_key_url(self):
key_url = "https://repo.saltproject.io/py3/{}/{}/{}/latest/salt-archive-keyring.gpg".format(
self.fullname, self.grains["lsb_distrib_release"], self.grains["osarch"]
self.fullname, self.grains["osrelease"], self.grains["osarch"]
)
if self.alt_repo: