From 17d0835d63d36c4bc9c37d47a31c009ccf6ea2e1 Mon Sep 17 00:00:00 2001
From: Jacques de Laval <jacques@de-laval.se>
Date: Tue, 23 Feb 2021 00:32:36 +0100
Subject: [PATCH] test: Only echo last output of command in retry

Signed-off-by: Jacques de Laval <jacques@de-laval.se>
---
 test/lib.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/lib.sh b/test/lib.sh
index 452f2536..f73ff4b4 100755
--- a/test/lib.sh
+++ b/test/lib.sh
@@ -54,10 +54,13 @@ retry() {
 
     for _ in $(seq 1 "$__retry_n"); do
         sleep "$__retry_sleep"
-        eval "$__retry_cmd" || continue
-        return 0
+        __retry_cmd_out=$(eval "$__retry_cmd") && \
+            echo "$__retry_cmd_out" && \
+            return 0
     done
-    eval "$__retry_cmd"
+    __retry_cmd_exit="$?"
+    echo "$__retry_cmd_out"
+    return "$__retry_cmd_exit"
 }
 
 say() {
@@ -90,8 +93,7 @@ log "$color_reset" '--' ''
 # Setup
 "$TEST_DIR/testenv_start.sh" finit &
 finit_ppid=$!
-# shellcheck disable=SC2016
-retry 'finit_pid=$(pgrep -P '"$finit_ppid"')'
+finit_pid=$(retry "pgrep -P $finit_ppid")
 
 tty=/dev/$(texec cat /sys/class/tty/console/active)
 texec cat "$tty" &