From c511134a94d1ff85251da155b6773574bcff53fe Mon Sep 17 00:00:00 2001 From: regnat Date: Tue, 1 Mar 2022 14:59:12 +0100 Subject: Acknowledge that the macOS tests are flaky Restart the tests (at most once) on `unexpected EOF` errors. This is truly ugly, but might prevent half of the CI runs to fail because of https://github.com/NixOS/nix/issues/3605 --- mk/run_test.sh | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'mk/run_test.sh') diff --git a/mk/run_test.sh b/mk/run_test.sh index 3783d3bf7..b876859f8 100755 --- a/mk/run_test.sh +++ b/mk/run_test.sh @@ -14,9 +14,27 @@ if [ -t 1 ]; then yellow="" normal="" fi -(cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null) -log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)" -status=$? + +run_test () { + (cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null) + log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)" + status=$? +} + +run_test "$1" + +# Hack: Retry the test if it fails with “unexpected EOF reading a line” as these +# appear randomly without anyone knowing why. +# See https://github.com/NixOS/nix/issues/3605 for more info +if [[ $status -ne 0 && $status -ne 99 && \ + "$(uname)" == "Darwin" && \ + "$log" =~ "unexpected EOF reading a line" +]]; then + echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)" + echo "$log" | sed 's/^/ /' + run_test "$1" +fi + if [ $status -eq 0 ]; then echo "$post_run_msg [${green}PASS$normal]" elif [ $status -eq 99 ]; then -- cgit v1.2.3 From 5d208cbe416ed38693cd33643731fd001135a582 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 2 Mar 2022 21:36:46 +0100 Subject: mk/run_test.sh: Add missing backslash --- mk/run_test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mk/run_test.sh') diff --git a/mk/run_test.sh b/mk/run_test.sh index b876859f8..7e95df2ac 100755 --- a/mk/run_test.sh +++ b/mk/run_test.sh @@ -28,7 +28,7 @@ run_test "$1" # See https://github.com/NixOS/nix/issues/3605 for more info if [[ $status -ne 0 && $status -ne 99 && \ "$(uname)" == "Darwin" && \ - "$log" =~ "unexpected EOF reading a line" + "$log" =~ "unexpected EOF reading a line" \ ]]; then echo "$post_run_msg [${yellow}FAIL$normal] (possibly flaky, so will be retried)" echo "$log" | sed 's/^/ /' -- cgit v1.2.3