tests: Kill containers (don't wait for shutdown)

We waste a lot of time waiting for Ubuntu containers to cleanly stop
right before we destroy them anyway.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>

diff --git a/src/tests/lxc-test-apparmor-mount b/src/tests/lxc-test-apparmor-mount
index 74fd8c6f8ece1cb6e48fb40b8ef0875e77f40cb3..bb9b1fce6bb31d7527d40c863f8e9af66883691a 100755 (executable)
--- a/src/tests/lxc-test-apparmor-mount
+++ b/src/tests/lxc-test-apparmor-mount
@@ -167,7 +167,7 @@ if [ "x$profile" != "x${default_profile}" ]; then
        echo "FAIL: confined container was in profile $profile"
        exit 1
 fi
-run_cmd lxc-stop -n $cname
+run_cmd lxc-stop -n $cname -k
 
 echo "test regular unconfined container"
 echo "lxc.aa_profile = unconfined" >> $HDIR/.local/share/lxc/$cname/config
@@ -179,7 +179,7 @@ if [ "x$profile" != "xunconfined" ]; then
        echo "FAIL: unconfined container was in profile $profile"
        exit 1
 fi
-run_cmd lxc-stop -n $cname
+run_cmd lxc-stop -n $cname -k
 
 echo "masking $MOUNTSR"
 mount --bind $dnam $MOUNTSR
@@ -209,7 +209,7 @@ if [ "x$profile" != "xunconfined" ]; then
        echo "FAIL: confined container was in profile $profile"
        exit 1
 fi
-run_cmd lxc-stop -n $cname
+run_cmd lxc-stop -n $cname -k
 
 echo "testing override"
 sed -i '/aa_profile/d' $HDIR/.local/share/lxc/$cname/config
@@ -226,6 +226,6 @@ if [ "x$profile" != "x${default_profile}" ]; then
        echo "FAIL: confined container was in profile $profile"
        exit 1
 fi
-run_cmd lxc-stop -n $cname
+run_cmd lxc-stop -n $cname -k
 
 DONE=1

diff --git a/src/tests/lxc-test-checkpoint-restore b/src/tests/lxc-test-checkpoint-restore
index 4c91339167fa98fa27a329ce76f6e14c57e919ce..2adb131e987a75fa140ae42597b9402d065cb030 100755 (executable)
--- a/src/tests/lxc-test-checkpoint-restore
+++ b/src/tests/lxc-test-checkpoint-restore
@@ -48,5 +48,5 @@ lxc-checkpoint -n $name -v -s -D /tmp/checkpoint || FAIL "failed checkpointing"
 lxc-wait -n $name -s STOPPED
 lxc-checkpoint -n $name -v -r -D /tmp/checkpoint || FAIL "failed restoring"
 
-lxc-stop -n $name -t 1
+lxc-stop -n $name -k
 lxc-destroy -f -n $name

diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv
index 8ba216f56f98bb2442f9035c8a5a580cfbf3c406..8486fbdeb5a94351a76b4f62a024a4ef2d9f3986 100755 (executable)
--- a/src/tests/lxc-test-unpriv
+++ b/src/tests/lxc-test-unpriv
@@ -185,7 +185,7 @@ for count in `seq 1 2`; do
     run_cmd lxc-info -n c1
     run_cmd lxc-attach -n c1 -- /bin/true
 
-    run_cmd lxc-stop -n c1
+    run_cmd lxc-stop -n c1 -k
 done
 
 run_cmd lxc-copy -s -n c1 -N c2
@@ -193,7 +193,7 @@ run_cmd lxc-start -n c2 -d
 p1=$(run_cmd lxc-info -n c2 -p -H)
 [ "$p1" != "-1" ] || { echo "Failed to start container c2"; false; }
 
-run_cmd lxc-stop -n c2
+run_cmd lxc-stop -n c2 -k
 
 if which cgm >/dev/null 2>&1; then
     echo "Testing containers under different cgroups per subsystem"