From 45af7058cd0cdae53a3ba2eab3a3c15bc6298ba8 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Tue, 7 Sep 2021 14:07:58 +0200
Subject: [PATCH 1/3] tests/gnrc_dhcpv6_client: pipe `command` output to
 /dev/null

---
 tests/gnrc_dhcpv6_client/dhcpv6_server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh b/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
index edfe0dc358..0c20e6d8b2 100755
--- a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
+++ b/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
@@ -6,7 +6,7 @@
 # Distributed under terms of the MIT license.
 #
 
-if ! command -v kea-dhcp6; then
+if ! command -v kea-dhcp6 > /dev/null; then
   echo -e "\033[31;1mCommand kea-dhcp6 required\033[0m" >&2
   exit 1
 fi

From 4c9547b388ec8b68e9611904cb9159365e11bfa2 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Tue, 7 Sep 2021 14:08:16 +0200
Subject: [PATCH 2/3] tests/gnrc_dhcpv6_client: kill potential previous Kea
 session

---
 tests/gnrc_dhcpv6_client/dhcpv6_server.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh b/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
index 0c20e6d8b2..64cff99a7a 100755
--- a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
+++ b/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
@@ -30,6 +30,11 @@ _dhcpv6_server() {
     # only used `mktemp` with dry-run above to get temp directory name, so we
     # still need to create the directory
     mkdir -p "${TMPDIR}"
+
+    if [ -f "${TMPDIR}/kea-dhcp6.kea-dhcp6.pid" ]; then
+        # Kill Kea instance from potential previous run:w
+        kill "$(cat "${TMPDIR}/kea-dhcp6.kea-dhcp6.pid")"
+    fi
     sed "s/\"{{\s*env\.IFACE\s*}}\"/\"${IFACE}\"/" "$2" > "${CONFIG}"
     if ! _kea_version_lesser_1_7_10; then
         # Top-level "Logging" config is not supported by Kea >=1.7.10, so move
@@ -55,5 +60,4 @@ EOF
         kea-dhcp6 -p "$1" -c "$CONFIG" &
 }
 
-# no need to kill from external, kea handles double instances gracefully
 _dhcpv6_server "$1" "$2" &

From 012b62b96e90e7b3d9effbbf14d7e5de67724512 Mon Sep 17 00:00:00 2001
From: Martine Lenders <m.lenders@fu-berlin.de>
Date: Tue, 7 Sep 2021 14:55:27 +0200
Subject: [PATCH 3/3] tests/gnrc_dhcpv6_client: inform user about TMPDIR

---
 tests/gnrc_dhcpv6_client/dhcpv6_server.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh b/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
index 64cff99a7a..8b267198c2 100755
--- a/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
+++ b/tests/gnrc_dhcpv6_client/dhcpv6_server.sh
@@ -31,6 +31,7 @@ _dhcpv6_server() {
     # still need to create the directory
     mkdir -p "${TMPDIR}"
 
+    echo "Running kea-dhcpv6 in data directory ${TMPDIR}"
     if [ -f "${TMPDIR}/kea-dhcp6.kea-dhcp6.pid" ]; then
         # Kill Kea instance from potential previous run:w
         kill "$(cat "${TMPDIR}/kea-dhcp6.kea-dhcp6.pid")"