Skip to content

Commit

Permalink
tests: Kill containers (don't wait for shutdown)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
stgraber committed Mar 22, 2017
1 parent 9ab76a7 commit 3bd06fd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/tests/lxc-test-unpriv
Expand Up @@ -168,13 +168,13 @@ p1=$(run_cmd lxc-info -n c1 -p -H)
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
run_cmd lxc-clone -s -o c1 -n c2
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"
Expand Down

0 comments on commit 3bd06fd

Please sign in to comment.