quine-global-labs/mirror-cockpit-project-cockpit
1
0
Fork 0
mirror of https://github.com/cockpit-project/cockpit.git synced 2026-11-03 21:49:50 -09:00
Code Issues Projects Releases Packages Wiki Activity

test: drop ubuntu-stable workarounds

Browse source 
The ubuntu-stable image is being retired (cockpit-project/bots#9447,
cockpit-project/bots#9453), so its test-side workarounds are now dead
code:

 - has_sudo_rs no longer needs to exclude ubuntu-stable; every
   remaining ubuntu* image ships sudo-rs.
 - the lintian missing-debian-watch-file-standard suppression only
   needs debian-trixie now.

Assisted-by: claude
This commit is contained in:
Jan Ščotka 2026-09-23 12:38:33 +02:00 committed by Freya Gustavsson
parent 853699ab96
commit 2e208fcf64
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/common/testlib.py
View file

@ -1883,7 +1883,7 @@ class MachineCase(unittest.TestCase):
self.multihost_enabled = image.startswith(("rhel-9", "centos-9"))
# sudo-rs behaves quite differently, tests need to adapt
self.has_sudo_rs = image.startswith("ubuntu") and image not in ["ubuntu-stable"]
self.has_sudo_rs = image.startswith("ubuntu")
def nonDestructiveSetup(self) -> None:
"""generic setUp/tearDown for @nondestructive tests"""

4
test/image-prepare
View file

@ -124,8 +124,8 @@ def build_install_package(dist_tars: list[str], image: str, *, quick: bool) -> l
if not quick and ('debian' in image or 'ubuntu' in image):
args.append("--run-command")
suppress = {'initial-upload-closes-no-bugs', 'newer-standards-version'}
# older OSes don't yet know about watch format v5; drop ubuntu-stable once that moves to lintian 2.127.0
if image in ["debian-trixie", "ubuntu-stable"]:
# older OSes don't yet know about watch format v5
if image in ["debian-trixie"]:
suppress.add("missing-debian-watch-file-standard")
args.append(fr"""