Merge pull request #1337 from stgraber/master

tests; Don't cause test failures on cleanup errors

Merge pull request #1337 from stgraber/master
de1d1db1 · Christian Brauner · GitHub · f8df61b2 · 9c50a526 · de1d1db1
Commit de1d1db1 authored Dec 03, 2016 by Christian Brauner Committed by GitHub Dec 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

lxc-test-usernic.in src/tests/lxc-test-usernic.in +2 -2

No files found.
--- a/src/tests/lxc-test-usernic.in
+++ b/src/tests/lxc-test-usernic.in
@@ -28,9 +28,9 @@ KNOWN_RELEASES="precise trusty xenial yakkety zesty"
 LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic"

 cleanup() {
-	(
-		set +e
+	set +e

+	(
 		lxc-stop -n usernic-c1 -k
 		lxc-destroy -n usernic-c1