aboutsummaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorregnat <rg@regnat.ovh>2022-03-01 14:59:12 +0100
committerregnat <rg@regnat.ovh>2022-03-01 15:25:05 +0100
commitc511134a94d1ff85251da155b6773574bcff53fe (patch)
treeaf91571183d05c54254b4a9d93aea2a4a5631e64 /mk
parent0cb5af5000517ffd0f81a25df5b3f4c05fac53f6 (diff)
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
Diffstat (limited to 'mk')
-rwxr-xr-xmk/run_test.sh24
1 files changed, 21 insertions, 3 deletions
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