tests: move ts_finalize_subtest after if/else blocks

Move ts_finalize_subtest out of individual if/else branches and
place it unconditionally after the entire block. This enforces
the ts_init_subtest/ts_finalize_subtest pairing introduced in
the previous commit.

Previously, ts_skip_subtest or ts_failed_subtest was used as a
terminal action instead of ts_finalize_subtest. Now each subtest
is a proper init/finalize block, with ts_skip_subtest and
ts_failed_subtest only setting state within the block.

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/chrt/all-tasks b/tests/ts/chrt/all-tasks
index ebad9f893ec7cf99e8bdb2573f0c9e3b3b3ef12d..4e9c26228a219ca562502362ce351d2b9f460fd3 100755 (executable)
--- a/tests/ts/chrt/all-tasks
+++ b/tests/ts/chrt/all-tasks
@@ -93,9 +93,8 @@ else
     else
         echo "retrieved real-time scheduling attributes for all tasks" >"$TS_OUTPUT"
     fi
-
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 
 ts_init_subtest "set-attributes"
@@ -133,9 +132,8 @@ else
     else
         echo "set real-time scheduling attributes for all tasks" >>"$TS_OUTPUT"
     fi
-
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 
 ts_finalize

diff --git a/tests/ts/libmount/loop b/tests/ts/libmount/loop
index 3a8e74051d26c280ba6ac2b8c85b099c93ee232f..412bea4ef3b0dde4ec1f2e8ae58d9ada3bf99d4a 100755 (executable)
--- a/tests/ts/libmount/loop
+++ b/tests/ts/libmount/loop
@@ -93,8 +93,8 @@ else
        $TS_CMD_UMOUNT "$TS_MOUNTPOINT" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
        udevadm settle
        ts_log "Success"
-       ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 ts_init_subtest "reuse"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT

diff --git a/tests/ts/libmount/utils b/tests/ts/libmount/utils
index d7993ef478047c5666038a397b568969d480a2cd..36fae39fbbab6b099704329e584694a4bf0fbf01 100755 (executable)
--- a/tests/ts/libmount/utils
+++ b/tests/ts/libmount/utils
@@ -55,18 +55,18 @@ ts_finalize_subtest
 ts_init_subtest "mountpoint"
 if [ -d /proc ]; then
        ts_run $TESTPROG --mountpoint /proc &> "$TS_OUTPUT"
-       ts_finalize_subtest
 else
        ts_skip_subtest "no /proc"
 fi
+ts_finalize_subtest
 
 ts_init_subtest "mountpoint-subdir"
 if [ -d /proc/sys/kernel ]; then
        ts_run $TESTPROG --mountpoint /proc/sys/kernel &> "$TS_OUTPUT"
-       ts_finalize_subtest
 else
        ts_skip_subtest "no /proc"
 fi
+ts_finalize_subtest
 
 ts_init_subtest "mountpoint-root"
 ts_run $TESTPROG --mountpoint / &> "$TS_OUTPUT"

diff --git a/tests/ts/losetup/losetup-loop b/tests/ts/losetup/losetup-loop
index 119e5a256d15a8d0acef175a26a20d05b4b0de52..8e3d9054f144a3ad34a6f347a395d7f7b04cdea8 100755 (executable)
--- a/tests/ts/losetup/losetup-loop
+++ b/tests/ts/losetup/losetup-loop
@@ -217,8 +217,8 @@ else
        $TS_CMD_LOSETUP -d "$LODEV"
        $TS_CMD_LOSETUP -d "$LODEVR" >/dev/null 2>&1
        ts_log "Success"
-       ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 udevadm settle
 
@@ -238,8 +238,8 @@ else
        $TS_CMD_LOSETUP -d "$LODEV"
        $TS_CMD_LOSETUP -d "$LODEVR" >/dev/null 2>&1
        ts_log "Success"
-       ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 udevadm settle
 

diff --git a/tests/ts/lsclocks/lsclocks b/tests/ts/lsclocks/lsclocks
index 9a6fdab2da6c810c838347bd1c581a6a5a294605..6ac5d35610fa6e18bd2f4bc7695bb59ab54d6bf2 100755 (executable)
--- a/tests/ts/lsclocks/lsclocks
+++ b/tests/ts/lsclocks/lsclocks
@@ -47,20 +47,20 @@ ts_init_subtest dynamic
 if [ -c /dev/ptp0 ] && [ -r /dev/ptp0 ]; then
        "$TS_CMD_LSCLOCKS" $NO_DISCOVER --dynamic-clock /dev/ptp0 --output TYPE,ID,CLOCK,NAME \
                | tail -1 > "$TS_OUTPUT" 2>> "$TS_ERRLOG"
-       ts_finalize_subtest
 else
        ts_skip_subtest "/dev/ptp0 not usable"
 fi
+ts_finalize_subtest
 
 ts_init_subtest rtc
 
 if [ -c /dev/rtc0 ] && [ -r /dev/rtc0 ]; then
        "$TS_CMD_LSCLOCKS" $NO_DISCOVER --rtc /dev/rtc0 --output TYPE,ID,CLOCK,NAME \
                | tail -1 > "$TS_OUTPUT" 2>> "$TS_ERRLOG"
-       ts_finalize_subtest
 else
        ts_skip_subtest "/dev/rtc0 not usable"
 fi
+ts_finalize_subtest
 
 ts_init_subtest cpu
 

diff --git a/tests/ts/lsfd/column-xmode b/tests/ts/lsfd/column-xmode
index 1c897aa149a4f6b52f5ad6a33ed57401871b1467..e616687298b4cce144c3b43773ede2c3e50f8f80 100755 (executable)
--- a/tests/ts/lsfd/column-xmode
+++ b/tests/ts/lsfd/column-xmode
@@ -99,8 +99,8 @@ else
        fi
     } > "$TS_OUTPUT" 2>&1
     wait "${MKFDS_PID}"
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 ts_init_subtest "XMODE-x-bit"
 if [ "$QEMU_USER" == "1" ]; then
@@ -117,8 +117,8 @@ else
        fi
     } > "$TS_OUTPUT" 2>&1
     wait "${MKFDS_PID}"
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 FILE=./test_mkfds_make_regular_file
 EXPR='(FD == '"$FD"')'

diff --git a/tests/ts/lsfd/mkfds-unix-dgram b/tests/ts/lsfd/mkfds-unix-dgram
index ec83769a0cf7c3bf6a6b5b4e5bd73be931021c67..6504e82c1a00d819df66505050fdc729d1bcbaac 100755 (executable)
--- a/tests/ts/lsfd/mkfds-unix-dgram
+++ b/tests/ts/lsfd/mkfds-unix-dgram
@@ -102,8 +102,8 @@ else
        fi
        wait "${MKFDS_PID}"
     } > "$TS_OUTPUT" 2>&1
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 ts_init_subtest "UNIX.IPEEER-column"
 if ! lsfd_check_sockdiag --subtest unix; then
@@ -139,7 +139,7 @@ else
        fi
        wait "${MKFDS_PID}"
     } > "$TS_OUTPUT" 2>&1
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 ts_finalize

diff --git a/tests/ts/misc/canonicalize b/tests/ts/misc/canonicalize
index 94fdb46945279f0337b4c2070d3fc36e0207af64..c1d62e44168fcd98ab77d459e6ac44972d117fd3 100755 (executable)
--- a/tests/ts/misc/canonicalize
+++ b/tests/ts/misc/canonicalize
@@ -67,11 +67,10 @@ if id $uid &>/dev/null; then
                        --inh-caps=-all --reset-env \
                        -- $TESTPROG ${BASE}/root-sym/foo \
                | sed "s:${BASE}::g" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
-
-       ts_finalize_subtest
 else
        ts_skip_subtest "nobody user is missing"
 fi
+ts_finalize_subtest
 
 
 # cleanup

diff --git a/tests/ts/misc/mbsencode b/tests/ts/misc/mbsencode
index 8d7967997ed4b71b47861d2200051edcc0639fe9..636401b6c8d6eff15f90472be2bea602f1398aba 100755 (executable)
--- a/tests/ts/misc/mbsencode
+++ b/tests/ts/misc/mbsencode
@@ -58,28 +58,28 @@ ts_finalize_subtest
 ts_init_subtest "invalid-ascii"
 if [ "$HAVE_WIDECHAR" = true ]; then
        $TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
-       ts_finalize_subtest
 else
        ts_skip_subtest 'No widechar support'
 fi
+ts_finalize_subtest
 
 ts_init_subtest "safe-utf8"
 if [ "$HAVE_WIDECHAR" = true ]; then
        LC_ALL=C.UTF-8 \
        $TS_HELPER_MBSENCODE --safe "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
-       ts_finalize_subtest
 else
        ts_skip_subtest 'No widechar support'
 fi
+ts_finalize_subtest
 
 ts_init_subtest "invalid-utf8"
 if [ "$HAVE_WIDECHAR" = true ]; then
        LC_ALL=C.UTF-8 \
        $TS_HELPER_MBSENCODE --invalid "${STRINGS[@]}" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
-       ts_finalize_subtest
 else
        ts_skip_subtest 'No widechar support'
 fi
+ts_finalize_subtest
 
 ts_finalize
 

diff --git a/tests/ts/mount/special b/tests/ts/mount/special
index 6a5b5085d49288628a544fb9606121c60f271ff4..a95754b3658f5a19480b67bf8b18875c238bef21 100755 (executable)
--- a/tests/ts/mount/special
+++ b/tests/ts/mount/special
@@ -87,12 +87,12 @@ EOF
                $TS_CMD_UMOUNT "$mountpoint"
                unset LIBMOUNT_UTAB
                rm -f $MOUNTER
-               ts_finalize_subtest
        else
                ts_skip_subtest "tmpfs not mounted"
        fi
 else
        ts_skip_subtest "tmpfs unsupported"
 fi
+ts_finalize_subtest
 
 ts_finalize

diff --git a/tests/ts/runuser/options b/tests/ts/runuser/options
index a49538fd343f52311b5c595e0350c041ff487ac9..fae08c6bd915ae53e74b65c1aab014e522487d5f 100755 (executable)
--- a/tests/ts/runuser/options
+++ b/tests/ts/runuser/options
@@ -39,9 +39,8 @@ unset -v UL_TEST_VAR
 
 if grep "$($TS_HELPER_STRERROR ENOTTY)" "$TS_ERRLOG"; then
     ts_skip_subtest "failed to launch login session: ENOTTY"
-else
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 
 ts_init_subtest "preserve-environment"
@@ -101,8 +100,7 @@ ps --version >/dev/null
 if ! compare_ptys; then
     ts_skip_subtest "$errmsg"
     unset -v errmsg
-else
-    ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 ts_finalize

diff --git a/tests/ts/unshare/env b/tests/ts/unshare/env
index f6f2f2d3e6a324ecaaa128c7dd621405a10a3d69..201f4451a8c3cb96225a26cb69f07549cde3c86b 100755 (executable)
--- a/tests/ts/unshare/env
+++ b/tests/ts/unshare/env
@@ -31,9 +31,8 @@ unset -v UL_TEST_ENV
 
 if grep -q "$($TS_HELPER_STRERROR EPERM)" "$TS_OUTPUT" "$TS_ERRLOG"; then
         ts_skip_subtest "missing permissions"
-else
-        ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 
 ts_init_subtest "whitelist-env"
@@ -43,8 +42,7 @@ export UL_TEST_ENV2=bar
 
 if grep -q "$($TS_HELPER_STRERROR EPERM)" "$TS_OUTPUT" "$TS_ERRLOG"; then
         ts_skip_subtest "missing permissions"
-else
-        ts_finalize_subtest
 fi
+ts_finalize_subtest
 
 ts_finalize