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>

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index bb9b1fce6bb31d7527d40c863f8e9af66883691a..6a50f54ef62e33f655254e90471b0a1612f8fad2 100755 (executable)
--- 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)

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 8486fbdeb5a94351a76b4f62a024a4ef2d9f3986..15a322017bbeff3b7c750afe52646219cb066320 100755 (executable)
--- 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