|
 |
8d419f |
From 740dd8e0a0c503980894968006a43fa05039e299 Mon Sep 17 00:00:00 2001
|
|
|
8d419f |
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
|
|
8d419f |
Date: Tue, 14 Jun 2022 09:01:00 +0900
|
|
|
8d419f |
Subject: [PATCH] test: drop unnecessary --no-pager option
|
|
|
8d419f |
|
|
|
8d419f |
(cherry picked from commit 8ed2103306fa6b3dcaf8d810e65e8957553ef752)
|
|
|
8d419f |
|
|
|
8d419f |
Related: #2087652
|
|
|
8d419f |
---
|
|
|
8d419f |
test/units/testsuite-45.sh | 10 +++++-----
|
|
|
8d419f |
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
8d419f |
|
|
|
8d419f |
diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
|
|
|
8d419f |
index d0d1ef2eb4..2069d2437f 100755
|
|
|
8d419f |
--- a/test/units/testsuite-45.sh
|
|
|
8d419f |
+++ b/test/units/testsuite-45.sh
|
|
|
8d419f |
@@ -25,7 +25,7 @@ test_timezone() {
|
|
|
8d419f |
|
|
|
8d419f |
if [[ -n "$ORIG_TZ" ]]; then
|
|
|
8d419f |
echo 'reset timezone to original'
|
|
|
8d419f |
- assert_eq "$(timedatectl --no-pager set-timezone "$ORIG_TZ" 2>&1)" ""
|
|
|
8d419f |
+ assert_eq "$(timedatectl set-timezone "$ORIG_TZ" 2>&1)" ""
|
|
|
8d419f |
assert_eq "$(readlink /etc/localtime | sed 's#^.*zoneinfo/##')" "$ORIG_TZ"
|
|
|
8d419f |
fi
|
|
|
8d419f |
}
|
|
|
8d419f |
@@ -206,11 +206,11 @@ EOF
|
|
|
8d419f |
timedatectl set-ntp false
|
|
|
8d419f |
for ((i=0;i<10;i++)); do
|
|
|
8d419f |
if (( i != 0 )); then sleep 1; fi
|
|
|
8d419f |
- if [[ "$(systemctl --no-pager show systemd-timesyncd --property ActiveState)" == "ActiveState=inactive" ]]; then
|
|
|
8d419f |
+ if [[ "$(systemctl show systemd-timesyncd --property ActiveState)" == "ActiveState=inactive" ]]; then
|
|
|
8d419f |
break;
|
|
|
8d419f |
fi
|
|
|
8d419f |
done
|
|
|
8d419f |
- assert_eq "$(systemctl --no-pager show systemd-timesyncd --property ActiveState)" "ActiveState=inactive"
|
|
|
8d419f |
+ assert_eq "$(systemctl show systemd-timesyncd --property ActiveState)" "ActiveState=inactive"
|
|
|
8d419f |
assert_ntp "false"
|
|
|
8d419f |
assert_rc 3 systemctl is-active --quiet systemd-timesyncd
|
|
|
8d419f |
|
|
|
8d419f |
@@ -221,11 +221,11 @@ EOF
|
|
|
8d419f |
assert_ntp "true"
|
|
|
8d419f |
for ((i=0;i<10;i++)); do
|
|
|
8d419f |
if (( i != 0 )); then sleep 1; fi
|
|
|
8d419f |
- if [[ "$(systemctl --no-pager show systemd-timesyncd --property ActiveState)" == "ActiveState=active" ]]; then
|
|
|
8d419f |
+ if [[ "$(systemctl show systemd-timesyncd --property ActiveState)" == "ActiveState=active" ]]; then
|
|
|
8d419f |
break;
|
|
|
8d419f |
fi
|
|
|
8d419f |
done
|
|
|
8d419f |
- assert_eq "$(systemctl --no-pager show systemd-timesyncd --property ActiveState)" "ActiveState=active"
|
|
|
8d419f |
+ assert_eq "$(systemctl show systemd-timesyncd --property ActiveState)" "ActiveState=active"
|
|
|
8d419f |
assert_rc 0 systemctl is-active --quiet systemd-timesyncd
|
|
|
8d419f |
|
|
|
8d419f |
echo 're-disable NTP'
|