tests: don't fail when no processes for user exist

Since we kicked lxc-monitord there will very likely be no user processes around anymore after all container's have been stopped. Which is a very very very good thing. So let's not error out when pkill doesn't find any processes. Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

tests: don't fail when no processes for user exist
412ec97c · Christian Brauner · Stéphane Graber · ef025635 · 412ec97c · 412ec97c
Unverified Commit 412ec97c authored Jun 12, 2017 by Christian Brauner Committed by Stéphane Graber Jul 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lxc-test-apparmor-mount src/tests/lxc-test-apparmor-mount +1 -1

lxc-test-unpriv src/tests/lxc-test-unpriv +1 -1

No files found.
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -50,7 +50,7 @@ cleanup() {
 	run_cmd lxc-destroy -f -n $cname || true
 	umount -l $MOUNTSR || true
 	rmdir $dnam || true
-	pkill -u $(id -u $TUSER) -9
+	pkill -u $(id -u $TUSER) -9 || true
 	sed -i '/lxcunpriv/d' /run/lxc/nics /etc/lxc/lxc-usernet
 	sed -i '/^lxcunpriv:/d' /etc/subuid /etc/subgid
 	rm -Rf $HDIR /run/user/$(id -u $TUSER)

--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -71,7 +71,7 @@ cleanup() {

 	run_cmd lxc-stop -n c2 -k || true
 	run_cmd lxc-stop -n c1 -k || true
-	pkill -u $(id -u $TUSER) -9
+	pkill -u $(id -u $TUSER) -9 || true

 	sed -i '/lxcunpriv/d' /run/lxc/nics /etc/lxc/lxc-usernet
 	sed -i '/^lxcunpriv:/d' /etc/subuid /etc/subgid