|
 |
8d419f |
From 60bc6c654dfbcbfeac0120143dd9869ceeb1a56e Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
8d419f |
Date: Tue, 14 Jun 2022 21:08:04 +0900
|
|
|
8d419f |
Subject: [PATCH] test: use trap RETURN
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit 6243063824838e027754cc2737bb975472d62de2)
|
|
|
8d419f |
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
test/units/testsuite-35.sh | 10 ++--------
|
|
|
8d419f |
test/units/testsuite-45.sh | 10 ++--------
|
|
|
8d419f |
2 files changed, 4 insertions(+), 16 deletions(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/test/units/testsuite-35.sh b/test/units/testsuite-35.sh
|
|
|
8d419f |
index e369cf8701..05d2a6c4c3 100755
|
|
|
8d419f |
--- a/test/units/testsuite-35.sh
|
|
|
8d419f |
+++ b/test/units/testsuite-35.sh
|
|
|
8d419f |
@@ -91,7 +91,7 @@ test_suspend_on_lid() {
|
|
|
8d419f |
fi
|
|
|
8d419f |
|
|
|
8d419f |
KILL_PID=
|
|
|
8d419f |
- trap test_suspend_tear_down EXIT
|
|
|
8d419f |
+ trap test_suspend_tear_down RETURN
|
|
|
8d419f |
|
|
|
8d419f |
# create fake suspend
|
|
|
8d419f |
mkdir -p /run/systemd/system/systemd-suspend.service.d
|
|
|
8d419f |
@@ -184,9 +184,6 @@ EOF
|
|
|
8d419f |
echo "logind crashed" >&2
|
|
|
8d419f |
exit 1
|
|
|
8d419f |
fi
|
|
|
8d419f |
-
|
|
|
8d419f |
- test_suspend_tear_down
|
|
|
8d419f |
- trap - EXIT
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
test_shutdown() {
|
|
|
8d419f |
@@ -269,7 +266,7 @@ test_session() {
|
|
|
8d419f |
return
|
|
|
8d419f |
fi
|
|
|
8d419f |
|
|
|
8d419f |
- trap test_session_tear_down EXIT
|
|
|
8d419f |
+ trap test_session_tear_down RETURN
|
|
|
8d419f |
|
|
|
8d419f |
# add user
|
|
|
8d419f |
useradd -s /bin/bash logind-test-user
|
|
|
8d419f |
@@ -361,9 +358,6 @@ EOF
|
|
|
8d419f |
getfacl -p "$dev" >&2
|
|
|
8d419f |
exit 1
|
|
|
8d419f |
fi
|
|
|
8d419f |
-
|
|
|
8d419f |
- test_session_tear_down
|
|
|
8d419f |
- trap - EXIT
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
: >/failed
|
|
|
8d419f |
diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
|
|
|
8d419f |
index fd8a99076b..322d8086e7 100755
|
|
|
8d419f |
--- a/test/units/testsuite-45.sh
|
|
|
8d419f |
+++ b/test/units/testsuite-45.sh
|
|
|
8d419f |
@@ -23,7 +23,7 @@ test_timezone() {
|
|
|
8d419f |
mv /etc/timezone /tmp/timezone.bak
|
|
|
8d419f |
fi
|
|
|
8d419f |
|
|
|
8d419f |
- trap restore_timezone EXIT
|
|
|
8d419f |
+ trap restore_timezone RETURN
|
|
|
8d419f |
|
|
|
8d419f |
if [[ -L /etc/localtime ]]; then
|
|
|
8d419f |
ORIG_TZ=$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')
|
|
|
8d419f |
@@ -49,9 +49,6 @@ test_timezone() {
|
|
|
8d419f |
assert_eq "$(cat /etc/timezone)" "$ORIG_TZ"
|
|
|
8d419f |
fi
|
|
|
8d419f |
fi
|
|
|
8d419f |
-
|
|
|
8d419f |
- restore_timezone
|
|
|
8d419f |
- trap - EXIT
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
restore_adjtime() {
|
|
|
8d419f |
@@ -75,7 +72,7 @@ test_adjtime() {
|
|
|
8d419f |
mv /etc/adjtime /etc/adjtime.bak
|
|
|
8d419f |
fi
|
|
|
8d419f |
|
|
|
8d419f |
- trap restore_adjtime EXIT
|
|
|
8d419f |
+ trap restore_adjtime RETURN
|
|
|
8d419f |
|
|
|
8d419f |
echo 'no adjtime file'
|
|
|
8d419f |
rm -f /etc/adjtime
|
|
|
8d419f |
@@ -182,9 +179,6 @@ LOCAL"
|
|
|
8d419f |
assert_eq "$(cat /etc/adjtime)" "0.0 0 0
|
|
|
8d419f |
0
|
|
|
8d419f |
LOCAL"
|
|
|
8d419f |
-
|
|
|
8d419f |
- restore_adjtime
|
|
|
8d419f |
- trap - EXIT
|
|
|
8d419f |
}
|
|
|
8d419f |
|
|
|
8d419f |
assert_ntp() {
|