[lxc-devel] [lxc/master] tests; Don't cause test failures on cleanup errors

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161201/ba61516f/attachment.bin>
-------------- next part --------------
From 9c50a5260f6356895e4e8a4fcae25b26a44a3c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Thu, 1 Dec 2016 18:34:00 -0500
Subject: [PATCH] tests; Don't cause test failures on cleanup errors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 src/tests/lxc-test-usernic.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tests/lxc-test-usernic.in b/src/tests/lxc-test-usernic.in
index 42a9a21..0b99baa 100755
--- 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