Skip to content

Test cleanups #2500

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
jelly wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Test cleanups #2500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea31310
test: prefer m.execute() for superuser only test
jelly Feb 16, 2026
a58c72c
test: prefer using self.execute over self.admin_s
jelly Feb 12, 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
20 changes: 10 additions & 10 deletions test/check-application
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,16 +137,16 @@ class TestApplication(testlib.MachineCase):
identity_file=m.identity_file)

# Enable user service as well; copy our images (except cockpit/ws) from system
self.admin_s.execute("""
self.execute("""
systemctl --user stop podman.service
for img in $(ls /var/lib/test-images/*.tar | grep -v cockpitws); do podman load < "$img"; done
""")
self.addCleanup(self.admin_s.execute, """
""", system=False)
self.addCleanup(self.execute, """
systemctl --user stop podman.service podman.socket
podman system reset --force
""")
self.addCleanup(self.admin_s.execute, "podman rm --force --time 0 --all")
self.addCleanup(self.admin_s.execute, "podman pod rm --force --time 0 --all")
""", system=False)
self.addCleanup(self.execute, "podman rm --force --time 0 --all", system=False)
self.addCleanup(self.execute, "podman pod rm --force --time 0 --all", system=False)

self.allow_journal_messages("/run.*/podman/podman: couldn't connect.*")
self.allow_journal_messages(".*/run.*/podman/podman.*Connection reset by peer")
Expand Down Expand Up @@ -1639,8 +1639,8 @@ Yaml={name}.yaml
# On cgroupsv1 systems just check that we get expected error messages

# Run a container
self.execute(f"podman run -dit --name swamped-crate --stop-timeout 0 {IMG_BUSYBOX} sh", system=True)
b.wait(lambda: self.execute("podman ps --all | grep -e swamped-crate", system=True))
m.execute(f"podman run -dit --name swamped-crate --stop-timeout 0 {IMG_BUSYBOX} sh")
b.wait(lambda: m.execute("podman ps --all | grep -e swamped-crate"))

# Checkpoint the container
self.performContainerAction("swamped-crate", "Checkpoint", system=True)
Expand All @@ -1662,10 +1662,10 @@ Yaml={name}.yaml

# Run a container
mac_address = '92:d0:c6:0a:29:38'
self.execute(f"""
m.execute(f"""
podman run -dit --mac-address {mac_address} --name swamped-crate --stop-timeout 0 {IMG_BUSYBOX} sh;
podman stop swamped-crate
""", system=True)
""")
b.wait(lambda: self.execute("podman ps --all | grep -e swamped-crate -e Exited", system=True))

# Check that the restore option is not present (i.e. start is a regular button)
Expand Down
Loading