test: Minor clean up

Signed-off-by: Jacques de Laval <jacques@de-laval.se>
This commit is contained in:
Jacques de Laval committed 2021-02-21 12:51:49 +01:00
1 parent 835f6a45d3
commit a8f562a7f5
1 file changed
+9 -7
+9 -7
View File
@@ -3,7 +3,7 @@
set -eu set -eu
texec() { texec() {
./testenv_exec.sh "$(pgrep -P "$finit_ppid")" "$@" ./testenv_exec.sh "$finit_pid" "$@"
} }
color_reset='\e[0m' color_reset='\e[0m'
@@ -15,17 +15,17 @@ log() {
} }
assert() { assert() {
msg=$1 __assert_msg=$1
shift shift
if [ ! "$@" ]; then if [ ! "$@" ]; then
log "$fg_red" ✘ "$msg" log "$fg_red" ✘ "$__assert_msg ($*)"
exit 1 exit 1
fi fi
log "$fg_green" ✔ "$msg" log "$fg_green" ✔ "$__assert_msg"
} }
say() { say() {
log "$fg_yellow" ● "$@" log "$fg_yellow" • "$@"
} }
teardown() { teardown() {
@@ -63,8 +63,10 @@ log "$color_reset" '--' ''
finit_ppid=$! finit_ppid=$!
for _ in $(seq 1 50); do for _ in $(seq 1 50); do
sleep 0.1 sleep 0.1
pgrep -P "$finit_ppid" > /dev/null || continue finit_pid=$(pgrep -P "$finit_ppid")
break if [ "$finit_pid" ]; then
break
fi
done done
tty=/dev/$(texec cat /sys/class/tty/console/active) tty=/dev/$(texec cat /sys/class/tty/console/active)