src/tests/lxc-test-unpriv: prevent fail on cleanup path

/run/user/$(id -u $TUSER) is a mountpoint for tmpfs, rm -rf
may fail with EBUSY errno. We should mask it and prevent test from marked
as failed because of this.

Also add set -x to make debugging easier in case of failures.

Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@canonical.com>

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 8abc3e0ad1ad7f7a91a85f0c4797b68e122f0701..579e30a95153698825b78ab61de804dc11a96797 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -66,7 +66,7 @@ cleanup() {
        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)
+       rm -Rf $HDIR /run/user/$(id -u $TUSER) || true
 
        deluser $TUSER
 
@@ -90,7 +90,7 @@ TUSER=lxcunpriv
 HDIR=/home/$TUSER
 
 trap cleanup EXIT SIGHUP SIGINT SIGTERM
-set -eu
+set -eux
 
 id $TUSER &> /dev/null && deluser -q --remove-home $TUSER
 useradd $TUSER