Skip to content

Commit 7790c2b

Browse files
committed
test: Drop duplicate cleanup of admin processes
The nondestructive `_terminate_sessions` runs before our cleanups and already calls `pkill -9 -u admin`.
1 parent 934beef commit 7790c2b

1 file changed

Lines changed: 0 additions & 7 deletions

File tree

test/machineslib.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,13 +494,6 @@ def stop_all() -> None:
494494
else:
495495
m.execute("systemctl reset-failed libvirtd; systemctl try-restart libvirtd")
496496

497-
# user libvirtd instance tends to SIGABRT with "Failed to find user record for uid .." on shutdown
498-
# during cleanup so make sure that there are no leftover user processes that bleed into the next test
499-
self.addCleanup(m.execute, """
500-
pkill -u admin || true;
501-
while [ -n "$(pgrep -au admin | grep -v 'systemd --user')" ]; do sleep 0.5; done
502-
""")
503-
504497
# FIXME: report downstream; AppArmor noisily denies some operations, but they are not required for us
505498
self.allow_journal_messages(r'.* type=1400 .* apparmor="DENIED" operation="capable" profile="\S*libvirtd.* capname="sys_rawio".*') # noqa: E501
506499
# AppArmor doesn't like the non-standard path for our storage pools

0 commit comments

Comments
 (0)