mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-30 23:49:35 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Stéphane Graber
2017-03-21 16:35:44 -04:00
parent f332b5d0a0
commit 09ef083882
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tests/lxc-test-apparmor-mount
View File

@@ -167,7 +167,7 @@ if [ "x$profile" != "x${default_profile}" ]; then
echo "FAIL: confined container was in profile $profile" echo "FAIL: confined container was in profile $profile"
exit 1 exit 1
fi fi
run_cmd lxc-stop -n $cname run_cmd lxc-stop -n $cname -k
echo "test regular unconfined container" echo "test regular unconfined container"
echo "lxc.aa_profile = unconfined" >> $HDIR/.local/share/lxc/$cname/config 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" echo "FAIL: unconfined container was in profile $profile"
exit 1 exit 1
fi fi
run_cmd lxc-stop -n $cname run_cmd lxc-stop -n $cname -k
echo "masking $MOUNTSR" echo "masking $MOUNTSR"
mount --bind $dnam $MOUNTSR mount --bind $dnam $MOUNTSR
@@ -209,7 +209,7 @@ if [ "x$profile" != "xunconfined" ]; then
echo "FAIL: confined container was in profile $profile" echo "FAIL: confined container was in profile $profile"
exit 1 exit 1
fi fi
run_cmd lxc-stop -n $cname run_cmd lxc-stop -n $cname -k
echo "testing override" echo "testing override"
sed -i '/aa_profile/d' $HDIR/.local/share/lxc/$cname/config 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" echo "FAIL: confined container was in profile $profile"
exit 1 exit 1
fi fi
run_cmd lxc-stop -n $cname run_cmd lxc-stop -n $cname -k
DONE=1 DONE=1

2
src/tests/lxc-test-checkpoint-restore
View File

@@ -48,5 +48,5 @@ lxc-checkpoint -n $name -v -s -D /tmp/checkpoint || FAIL "failed checkpointing"
lxc-wait -n $name -s STOPPED lxc-wait -n $name -s STOPPED
lxc-checkpoint -n $name -v -r -D /tmp/checkpoint || FAIL "failed restoring" 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 lxc-destroy -f -n $name

4
src/tests/lxc-test-unpriv
View File

@@ -185,7 +185,7 @@ for count in `seq 1 2`; do
run_cmd lxc-info -n c1 run_cmd lxc-info -n c1
run_cmd lxc-attach -n c1 -- /bin/true run_cmd lxc-attach -n c1 -- /bin/true
run_cmd lxc-stop -n c1 run_cmd lxc-stop -n c1 -k
done done
run_cmd lxc-copy -s -n c1 -N c2 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=$(run_cmd lxc-info -n c2 -p -H)
[ "$p1" != "-1" ] || { echo "Failed to start container c2"; false; } [ "$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 if which cgm >/dev/null 2>&1; then
echo "Testing containers under different cgroups per subsystem" echo "Testing containers under different cgroups per subsystem"