shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

Revert "test: temporary workaround for #21819"

Browse Source 
This reverts commit 95e35511bb.
This commit is contained in:
Frantisek Sumsal 2022-03-11 18:17:58 +01:00 committed by Yu Watanabe
parent 82a5de9fd2
commit ed1cbdc347
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/TEST-64-UDEV-STORAGE/test.sh
View File

@ -119,6 +119,7 @@ test_run() {
# Execute each currently defined function starting with "testcase_"
for testcase in "${TESTCASES[@]}"; do
_image_cleanup
echo "------ $testcase: BEGIN ------"
# Note for my future frustrated self: `fun && xxx` (as well as ||, if, while,
# until, etc.) _DISABLES_ the `set -e` behavior in _ALL_ nested function
@ -129,14 +130,8 @@ test_run() {
# So, be careful when adding clean up snippets in the testcase_*() functions -
# if the `test_run_one()` function isn't the last command, you have propagate
# the exit code correctly (e.g. `test_run_one() || return $?`, see below).
# FIXME: temporary workaround for intermittent fails in certain tests
# See: https://github.com/systemd/systemd/issues/21819
for ((_i = 0; _i < 3; _i++)); do
_image_cleanup
ec=0
"$testcase" "$test_id" && break || ec=$?
done
ec=0
"$testcase" "$test_id" || ec=$?
case $ec in
0)
passed+=("$testcase")