[lxc-devel] [lxd/master] More test fixes

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 301 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20161206/45e9ab7d/attachment.bin>
-------------- next part --------------
From 4698fa0fdda005a5558142f627ddcf9cf0c19602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 6 Dec 2016 17:43:35 +0100
Subject: [PATCH 1/3] tests: Fix bad variable name
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>
---
 test/main.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/main.sh b/test/main.sh
index 905ebe3..1b8e5ae 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -307,7 +307,7 @@ cleanup() {
   # Allow for inspection
   if [ -n "${LXD_INSPECT:-}" ]; then
     if [ "${TEST_RESULT}" != "success" ]; then
-      echo "==> TEST DONE: ${TEST_DESCRIPTION}"
+      echo "==> TEST DONE: ${TEST_CURRENT_DESCRIPTION}"
     fi
     echo "==> Test result: ${TEST_RESULT}"
 
@@ -341,7 +341,7 @@ cleanup() {
   echo ""
   echo ""
   if [ "${TEST_RESULT}" != "success" ]; then
-    echo "==> TEST DONE: ${TEST_DESCRIPTION}"
+    echo "==> TEST DONE: ${TEST_CURRENT_DESCRIPTION}"
   fi
   echo "==> Test result: ${TEST_RESULT}"
 }

From e5a85b4c0a5b61f0dbea4f3dc56462cd096f1d59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 6 Dec 2016 17:44:06 +0100
Subject: [PATCH 2/3] tests: Shorten test name to fit on Jenkins
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>
---
 test/main.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/main.sh b/test/main.sh
index 1b8e5ae..f94e85c 100755
--- a/test/main.sh
+++ b/test/main.sh
@@ -439,7 +439,7 @@ run_test test_concurrent_exec "concurrent exec"
 run_test test_concurrent "concurrent startup"
 run_test test_snapshots "container snapshots"
 run_test test_snap_restore "snapshot restores"
-run_test test_config_profiles "profiles, devices and configuration"
+run_test test_config_profiles "profiles and configuration"
 run_test test_server_config "server configuration"
 run_test test_filemanip "file manipulations"
 run_test test_network "network management"

From f7ee8e4fdb79830111cdc39afded287e92ce717f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Tue, 6 Dec 2016 18:01:07 +0100
Subject: [PATCH 3/3] tests: whitespace fix
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>
---
 test/suites/remote.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/suites/remote.sh b/test/suites/remote.sh
index b43e281..d9c0a96 100644
--- a/test/suites/remote.sh
+++ b/test/suites/remote.sh
@@ -132,9 +132,9 @@ test_remote_usage() {
   lxc_remote delete lxd2:c1
 
   # Test that local and public servers can be accessed without a client cert
-	mv "${LXD_CONF}/client.crt" "${LXD_CONF}/client.crt.bak"
+  mv "${LXD_CONF}/client.crt" "${LXD_CONF}/client.crt.bak"
   mv "${LXD_CONF}/client.key" "${LXD_CONF}/client.key.bak"
-  
+
   # testimage should still exist on the local server.  Count the number of
   # matches so the output isn't polluted with the results.
   lxc_remote image list local: | grep -c testimage