From 3bd06fd0f555ec151619494685841e90ec8fac02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Graber?= Date: Tue, 21 Mar 2017 16:35:44 -0400 Subject: [PATCH] tests: Kill containers (don't wait for shutdown) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 --- src/tests/lxc-test-unpriv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tests/lxc-test-unpriv b/src/tests/lxc-test-unpriv index 54ddc6637..bd6f294b3 100755 --- a/src/tests/lxc-test-unpriv +++ b/src/tests/lxc-test-unpriv @@ -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" -- 2.47.2