From c85a40bc4dfe01c3860fa6a12f298cd1db50a337 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Thu, 23 Jan 2014 20:45:27 -0500 Subject: [PATCH] tests: Speed up lxc-test-usernic MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- src/tests/lxc-test-usernic | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tests/lxc-test-usernic b/src/tests/lxc-test-usernic index f3194dda4..d00b223b3 100755 --- a/src/tests/lxc-test-usernic +++ b/src/tests/lxc-test-usernic @@ -27,7 +27,7 @@ cleanup() { ( set +e - lxc-stop -n usernic-c1 + lxc-stop -n usernic-c1 -k lxc-destroy -n usernic-c1 sed -i '/usernic-user/d' /var/run/lxc/nics /etc/lxc/lxc-usernet @@ -36,7 +36,7 @@ cleanup() { brctl delbr usernic-br0 brctl delbr usernic-br1 - run_cmd "lxc-stop -n b1" + run_cmd "lxc-stop -n b1 -k" pkill -u $(id -u usernic-user) -9 rm -rf /tmp/usernic-test /home/usernic-user /run/user/$(id -u usernic-user) @@ -129,7 +129,7 @@ if run_cmd "lxc-user-nic $p1 veth usernic-br0 xx4"; then fi # Shut down and restart the container, should be able to assign more nics -run_cmd "lxc-stop -n b1" +run_cmd "lxc-stop -n b1 -k" run_cmd "lxc-start -n b1 -d" p1=$(run_cmd "lxc-info -n b1 -p -H") @@ -138,7 +138,7 @@ if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx5"; then cleanup 1 fi -run_cmd "lxc-stop -n b1" +run_cmd "lxc-stop -n b1 -k" # Create a root-owned ns lxc-create -t busybox -n usernic-c1 -- 2.47.2