From ed1cbdc347aeca077a7f6e88eda590340c004c34 Mon Sep 17 00:00:00 2001
From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 11 Mar 2022 18:17:58 +0100
Subject: [PATCH] Revert "test: temporary workaround for #21819"

This reverts commit 95e35511bbdb7810c00c2e4a6cbda5b187192f74.
---
 test/TEST-64-UDEV-STORAGE/test.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/TEST-64-UDEV-STORAGE/test.sh b/test/TEST-64-UDEV-STORAGE/test.sh
index c360c8b6610..04632952d00 100755
--- a/test/TEST-64-UDEV-STORAGE/test.sh
+++ b/test/TEST-64-UDEV-STORAGE/test.sh
@@ -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")