From d0ab6d91c9a4a696d32cce7dc5d156e170af60a3 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 12 Jun 2017 16:06:17 +0200 Subject: [PATCH] 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 --- src/tests/lxc-test-apparmor-mount | 2 +- src/tests/lxc-test-unpriv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount index bb9b1fce6..6a50f54ef 100755 --- 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 8486fbdeb..15a322017 100755 --- 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 -- 2.47.2