Skip to content

Stabilize testsuite #70282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
m-czernek wants to merge 2 commits into
base: 3008.x
Choose a base branch
from
+33 −17
Open

Stabilize testsuite #70282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e07f0c2
Fix repo URL that had expired gpg key
m-czernek Sep 8, 2026
06b2de8
Fix behavior on SUSE vs openSUSE systems
m-czernek Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions tests/pytests/functional/states/pkgrepo/test_suse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ def suse_state_tree(grains, pkgrepo, state_tree):
- comments:
- '# Salt Test'
- refresh: 1
{% if grains['osmajorrelease'] == 15 %}
- baseurl: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP4/standard/
- humanname: openSUSE Backports for SLE 15 SP4
- gpgkey: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP4/standard/repodata/repomd.xml.key
{% elif grains['osfullname'] == 'openSUSE Tumbleweed' %}
{% if grains['osfullname'] == 'openSUSE Tumbleweed' %}
- baseurl: http://download.opensuse.org/tumbleweed/repo/oss/
- humanname: openSUSE Tumbleweed OSS
- gpgkey: https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.key
{% else %}
- baseurl: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP7/standard/
- humanname: openSUSE Backports for SLE 15 SP7
- gpgkey: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP7/standard/repodata/repomd.xml.key
{% endif %}
"""

Expand All @@ -51,14 +51,14 @@ def suse_state_tree(grains, pkgrepo, state_tree):
- comments:
- '# Salt Test (modified)'
- refresh: 1
{% if grains['osmajorrelease'] == 15 %}
- baseurl: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP4/standard/
- humanname: Salt modified Backports
- gpgkey: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP4/standard/repodata/repomd.xml.key
{% elif grains['osfullname'] == 'openSUSE Tumbleweed' %}
{% if grains['osfullname'] == 'openSUSE Tumbleweed' %}
- baseurl: http://download.opensuse.org/tumbleweed/repo/oss/
- humanname: Salt modified OSS
- gpgkey: https://download.opensuse.org/tumbleweed/repo/oss/repodata/repomd.xml.key
{% else %}
- baseurl: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP7/standard/
- humanname: Salt modified Backports
- gpgkey: https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP7/standard/repodata/repomd.xml.key
{% endif %}
"""

Expand Down Expand Up @@ -192,12 +192,12 @@ def _run(name, test=False):
"comments": {"new": ["# Salt Test (modified)"], "old": None},
"refresh": {"new": 1, "old": None},
"gpgkey": {
"new": "https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP4/standard/repodata/repomd.xml.key",
"new": "https://download.opensuse.org/repositories/openSUSE:/Backports:/SLE-15-SP7/standard/repodata/repomd.xml.key",
"old": None,
},
"name": {
"new": "Salt modified Backports",
"old": "openSUSE Backports for SLE 15 SP4",
"old": "openSUSE Backports for SLE 15 SP7",
},
}
assert state.comment.startswith(
Expand All @@ -213,7 +213,7 @@ def _run(name, test=False):
assert state.changes == {
"name": {
"new": "Salt modified Backports",
"old": "openSUSE Backports for SLE 15 SP4",
"old": "openSUSE Backports for SLE 15 SP7",
}
}
assert state.comment == "Configured package repo 'salttest'"
24 changes: 20 additions & 4 deletions tests/pytests/functional/states/test_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,14 @@ def test_user_present_nondefault(grains, modules, states, username, user_home):
if not salt.utils.platform.is_darwin() and not salt.utils.platform.is_windows():
assert user_home.is_dir()

if grains["os_family"] == "Suse" and not (
grains.get("transactional", False) or grains.get("osmajorrelease", 0) >= 16
if (
grains["os_family"] == "Suse"
and not grains.get("transactional", False)
and grains.get("osmajorrelease", 0) < 16
and (
grains.get("osrelease_info", ()) < (15, 6)
or grains.get("osfullname", "") == "SLES"
)
):
expected_group_name = "users"
elif grains["os_family"] == "MacOS":
Expand Down Expand Up @@ -415,7 +421,12 @@ def test_user_present_change_groups(
):
expected_groups = [group_2.name, group_1.name]
if grains["os_family"] == "Suse" and (
grains.get("transactional", False) or grains.get("osmajorrelease", 0) >= 16
grains.get("transactional", False)
or grains.get("osmajorrelease", 0) >= 16
or (
grains.get("osrelease_info", ()) >= (15, 6)
and grains.get("osfullname", "") != "SLES"
)
):
expected_groups.append(username)

Expand Down Expand Up @@ -449,7 +460,12 @@ def test_user_present_change_optional_groups(
):
expected_groups = [group_2.name, group_1.name]
if grains["os_family"] == "Suse" and (
grains.get("transactional", False) or grains.get("osmajorrelease", 0) >= 16
grains.get("transactional", False)
or grains.get("osmajorrelease", 0) >= 16
or (
grains.get("osrelease_info", ()) >= (15, 6)
and grains.get("osfullname", "") != "SLES"
)
):
expected_groups.append(username)

Expand Down
Loading