Commit c85a40bc by Stéphane Graber

tests: Speed up lxc-test-usernic

parent 8ced4fd4
...@@ -27,7 +27,7 @@ cleanup() { ...@@ -27,7 +27,7 @@ cleanup() {
( (
set +e set +e
lxc-stop -n usernic-c1 lxc-stop -n usernic-c1 -k
lxc-destroy -n usernic-c1 lxc-destroy -n usernic-c1
sed -i '/usernic-user/d' /var/run/lxc/nics /etc/lxc/lxc-usernet sed -i '/usernic-user/d' /var/run/lxc/nics /etc/lxc/lxc-usernet
...@@ -36,7 +36,7 @@ cleanup() { ...@@ -36,7 +36,7 @@ cleanup() {
brctl delbr usernic-br0 brctl delbr usernic-br0
brctl delbr usernic-br1 brctl delbr usernic-br1
run_cmd "lxc-stop -n b1" run_cmd "lxc-stop -n b1 -k"
pkill -u $(id -u usernic-user) -9 pkill -u $(id -u usernic-user) -9
rm -rf /tmp/usernic-test /home/usernic-user /run/user/$(id -u usernic-user) 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 ...@@ -129,7 +129,7 @@ if run_cmd "lxc-user-nic $p1 veth usernic-br0 xx4"; then
fi fi
# Shut down and restart the container, should be able to assign more nics # 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" run_cmd "lxc-start -n b1 -d"
p1=$(run_cmd "lxc-info -n b1 -p -H") 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 ...@@ -138,7 +138,7 @@ if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx5"; then
cleanup 1 cleanup 1
fi fi
run_cmd "lxc-stop -n b1" run_cmd "lxc-stop -n b1 -k"
# Create a root-owned ns # Create a root-owned ns
lxc-create -t busybox -n usernic-c1 lxc-create -t busybox -n usernic-c1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment