From: Joey Hess Date: Mon, 2 May 2022 18:09:37 +0000 (-0400) Subject: filter out ExitSuccess X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~75^2~13 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=217798f3f16e1123ba7e51420eee0b9a426c8a99;p=git-annex.git filter out ExitSuccess This avoids displaying the unexpected exit codes message when the list is eg [ExitSuccess, ExitFailure 1]. Sponsored-by: Dartmouth College's Datalad project --- diff --git a/Test/Framework.hs b/Test/Framework.hs index 25be216408..3bb9c2d1d6 100644 --- a/Test/Framework.hs +++ b/Test/Framework.hs @@ -744,8 +744,8 @@ parallelTestRunner' numjobs opts mkts exitcodes <- forConcurrently [1..numjobs] $ \_ -> worker [] nvar runone unless (keepFailuresOption opts) finalCleanup - case nub (concat exitcodes) of - [ExitSuccess] -> exitSuccess + case nub (filter (/= ExitSuccess) (concat exitcodes)) of + [] -> exitSuccess [ExitFailure 1] -> do putStrLn " (Failures above could be due to a bug in git-annex, or an incompatibility" putStrLn " with utilities, such as git, installed on this system.)" diff --git a/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__.mdwn b/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__.mdwn index 9585b1c030..95220dc79b 100644 --- a/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__.mdwn +++ b/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__.mdwn @@ -34,3 +34,5 @@ cron-20220418/build-ubuntu.yaml-665-0346631d-failed/test-annex (nfs-home, ubuntu [[!meta author=yoh]] [[!tag projects/datalad]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__/comment_3_89e9d65073a58188024290a2b32fda2e._comment b/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__/comment_3_89e9d65073a58188024290a2b32fda2e._comment new file mode 100644 index 0000000000..4467555517 --- /dev/null +++ b/doc/bugs/sporadic___40____63____41___fail_of_crypto_test__63__/comment_3_89e9d65073a58188024290a2b32fda2e._comment @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 3""" + date="2022-05-02T17:57:21Z" + content=""" +Noticed this: + + Test subprocesses exited with unexpected exit codes: [ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitFailure 1,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess,ExitSuccess] + +In this test run: + +There was a test failure indeed there, which was another bug that +is now fixed. But notice the `ExitFailure 1` in the list of exit codes. + +The code around handing exit codes has changed from before, and still had a bug, +because a list with `ExitFailure 1` will cause that message, incorrectly. +(Now fixed that.) + +But, this seems to show that it's no longer hiding the actual problem +exit code when a test fails, which it was somehow apparently doing before. +So I think this bug can be closed as fully fixed now. +"""]]