From a8f562a7f5e794f214f48d22fc6a7bb1688d515b Mon Sep 17 00:00:00 2001
From: Jacques de Laval <jacques@de-laval.se>
Date: Sun, 21 Feb 2021 12:51:49 +0100
Subject: [PATCH] test: Minor clean up

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

diff --git a/test/runtest.sh b/test/runtest.sh
index 9992717b..00c3d3de 100755
--- a/test/runtest.sh
+++ b/test/runtest.sh
@@ -3,7 +3,7 @@
 set -eu
 
 texec() {
-    ./testenv_exec.sh "$(pgrep -P "$finit_ppid")" "$@"
+    ./testenv_exec.sh "$finit_pid" "$@"
 }
 
 color_reset='\e[0m'
@@ -15,17 +15,17 @@ log() {
 }
 
 assert() {
-    msg=$1
+    __assert_msg=$1
     shift
     if [ ! "$@" ]; then
-        log "$fg_red" ✘ "$msg"
+        log "$fg_red" ✘ "$__assert_msg ($*)"
         exit 1
     fi
-    log "$fg_green" ✔ "$msg"
+    log "$fg_green" ✔ "$__assert_msg"
 }
 
 say() {
-    log "$fg_yellow" ● "$@"
+    log "$fg_yellow" • "$@"
 }
 
 teardown() {
@@ -63,8 +63,10 @@ log "$color_reset" '--' ''
 finit_ppid=$!
 for _ in $(seq 1 50); do
     sleep 0.1
-    pgrep -P "$finit_ppid" > /dev/null || continue
-    break
+    finit_pid=$(pgrep -P "$finit_ppid")
+    if [ "$finit_pid" ]; then
+        break
+    fi
 done
 
 tty=/dev/$(texec cat /sys/class/tty/console/active)