[lxc-devel] [lxd/master] test: Fixes bridge tests detection of busybox udhcpc6 presence

[tomponline on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 407 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190729/8dffd607/attachment.bin>
-------------- next part --------------
From 24ac9be2c904619a56846254d2019d20da1d7072 Mon Sep 17 00:00:00 2001
From: Thomas Parrott <thomas.parrott at canonical.com>
Date: Mon, 29 Jul 2019 18:51:57 +0100
Subject: [PATCH] test: Fixes bridge tests detection of busybox udhcpc6
 presence

Now tests can run without udhcpc6 cleanly.

Signed-off-by: Thomas Parrott <thomas.parrott at canonical.com>
---
 test/suites/container_devices_nic_bridged.sh           | 8 ++++++--
 test/suites/container_devices_nic_bridged_filtering.sh | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/suites/container_devices_nic_bridged.sh b/test/suites/container_devices_nic_bridged.sh
index 8fd8917c83..0a39a7fea7 100644
--- a/test/suites/container_devices_nic_bridged.sh
+++ b/test/suites/container_devices_nic_bridged.sh
@@ -303,8 +303,12 @@ test_container_devices_nic_bridged() {
   fi
 
   # Request DHCPv6 lease (if udhcpc6 is in busybox image).
-  busyboxUdhcpc6=$(lxc exec "${ctName}" -- busybox --list | grep udhcpc6)
-  if [ "${busyboxUdhcpc6}" = "udhcpc6" ]; then
+  busyboxUdhcpc6=1
+  if ! lxc exec "${ctName}" -- busybox --list | grep udhcpc6 ; then
+    busyboxUdhcpc6=0
+  fi
+
+  if [ "$busyboxUdhcpc6" = "1" ]; then
         lxc exec "${ctName}" -- udhcpc6 -i eth0
   fi
 
diff --git a/test/suites/container_devices_nic_bridged_filtering.sh b/test/suites/container_devices_nic_bridged_filtering.sh
index e536efcbde..ac10a28b82 100644
--- a/test/suites/container_devices_nic_bridged_filtering.sh
+++ b/test/suites/container_devices_nic_bridged_filtering.sh
@@ -234,8 +234,12 @@ test_container_devices_nic_bridged_filtering() {
   # Check DHCPv6 allocation still works (if udhcpc6 is in busybox image).
   lxc exec "${ctPrefix}A" -- ip link set dev eth0 address "${ctAMAC}" up
 
-  busyboxUdhcpc6=$(lxc exec "${ctPrefix}A" -- busybox --list | grep udhcpc6)
-  if [ "${busyboxUdhcpc6}" = "udhcpc6" ]; then
+  busyboxUdhcpc6=1
+  if ! lxc exec "${ctPrefix}A" -- busybox --list | grep udhcpc6 ; then
+    busyboxUdhcpc6=0
+  fi
+
+  if [ "$busyboxUdhcpc6" = "1" ]; then
       lxc exec "${ctPrefix}A" -- udhcpc6 -i eth0 -n
   fi