Skip to content

Commit

Permalink
test: Expect podman rm --all to work
Browse files Browse the repository at this point in the history
We want to know when they actually fail -- ignoring that may corrupt the
VM and break the next test.
  • Loading branch information
martinpitt committed Feb 8, 2024
1 parent f910e3c commit df71695
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions test/check-application
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,11 @@ class TestApplication(testlib.MachineCase):
self.addCleanup(self.admin_s.execute, "systemctl --user stop podman.service podman.socket || true")
# Ubuntu 22.04 has old podman that does not know about --time
if m.image == 'ubuntu-2204':
self.addCleanup(self.admin_s.execute, "podman rm --force --all || true", timeout=300)
self.addCleanup(self.admin_s.execute, "podman pod rm --force --all || true", timeout=300)
self.addCleanup(self.admin_s.execute, "podman rm --force --all", timeout=300)
self.addCleanup(self.admin_s.execute, "podman pod rm --force --all", timeout=300)
else:
self.addCleanup(self.admin_s.execute, "podman rm --force --time 0 --all || true")
self.addCleanup(self.admin_s.execute, "podman pod rm --force --time 0 --all || true")
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")

# But disable it globally so that "systemctl --user disable" does what we expect
m.execute("systemctl --global disable podman.socket")
Expand Down

0 comments on commit df71695

Please sign in to comment.