From 4575a6850ce3eb08fca19964260c56220eb8467a Mon Sep 17 00:00:00 2001
From: Adirelle <adirelle@gmail.com>
Date: Sat, 11 May 2024 11:43:35 +0200
Subject: [PATCH] test: fix GA annotation parameters.

---
 e2e/assert.sh     |  2 +-
 e2e/run_all_tests | 20 +++++---------------
 e2e/run_test      |  3 ++-
 e2e/style.sh      |  7 ++++---
 4 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/e2e/assert.sh b/e2e/assert.sh
index 29dd0dc7e..372a6a89e 100755
--- a/e2e/assert.sh
+++ b/e2e/assert.sh
@@ -4,7 +4,7 @@
 source "$TEST_ROOT/style.sh"
 
 fail() {
-  title="assertion failed" err "$*"
+  title="E2E assertion failed" err "$*"
   exit 1
 }
 
diff --git a/e2e/run_all_tests b/e2e/run_all_tests
index e04bb80e8..859174af9 100755
--- a/e2e/run_all_tests
+++ b/e2e/run_all_tests
@@ -8,8 +8,7 @@ source "$SCRIPT_DIR/style.sh"
 
 FILES="$(find "$SCRIPT_DIR" -name 'test_*' -type f -printf '%P\n' | sort)"
 test_count=0
-passed_tests=()
-failed_tests=()
+status=0
 
 if [ -n "${GITHUB_STEP_SUMMARY:-}" ]; then
   {
@@ -26,20 +25,11 @@ for f in $FILES; do
       continue
     fi
   fi
-  if "$ROOT/e2e/run_test" "$f"; then
-    passed_tests=("${passed_tests[@]}" "$f")
-  else
-    failed_tests=("${failed_tests[@]}" "$f")
+  if ! "$ROOT/e2e/run_test" "$f"; then
+    status=1
   fi
   test_count=$((test_count + 1))
 done
 
-echo "e2e: ran $test_count tests" >&2
-
-if [[ -n "${passed_tests[*]}" ]]; then
-  ok "e2e: ${#passed_tests[*]} tests passed: ${passed_tests[*]}"
-fi
-if [[ -n "${failed_tests[*]}" ]]; then
-  err "e2e: ${#failed_tests[*]} tests failed: ${failed_tests[*]}"
-  exit 1
-fi
+echo "E2E: ran $test_count tests" >&2
+exit $status
diff --git a/e2e/run_test b/e2e/run_test
index c39906d2e..1f4dcf1bb 100755
--- a/e2e/run_test
+++ b/e2e/run_test
@@ -76,8 +76,9 @@ run_test() {
     remove_isolated_env
     STATUS_MSG=":white_check_mark:"
   else
-    title="E2E test failed" err "Test exited with status code $status"
+    title="E2E test failed: $TEST" err "Exited with status code $status"
     STATUS_MSG=":x:"
+    echo "Test environment can be examined in $TEST_ISOLATED_DIR" >&2
   fi
   if [[ -n "${GITHUB_STEP_SUMMARY:-}" ]]; then
     echo "| $TEST | $((END - START))s | $STATUS_MSG" >>"$GITHUB_STEP_SUMMARY"
diff --git a/e2e/style.sh b/e2e/style.sh
index f0ae538ea..31f660d1d 100644
--- a/e2e/style.sh
+++ b/e2e/style.sh
@@ -3,9 +3,10 @@
 if [[ -n ${GITHUB_ACTION:-} ]]; then
   # Output Github action annotations
   annotate() {
-    : "${file:=${TEST_SCRIPT:-}}"
-    : "${title:=}"
-    echo "::${type:?}${file:+ file=${file}}${title:+ title=${title}}::$*" >&2
+    local parameters=""
+    [[ -n ${file:=${TEST_SCRIPT:-}} ]] && parameters="file=${file}"
+    [[ -n ${title:-} ]] && parameters="${parameters:+,}title=${title}"
+    echo "::${type:-debug}${parameters:+ ${parameters}}::$*" >&2
   }
   err() { type=error annotate "$*"; }
   warn() { type=warning annotate "$*"; }