diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-04-03 08:19:08 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-04-03 08:19:08 +0200 |
| commit | 6c34ed511173ae830784e4e49dc97a4d925451d2 (patch) | |
| tree | 913565b768c2a380285470fb5ac5569a607a2fd4 /test | |
| parent | 570ee29ce121a9de8348696e96960e1f562547f3 (diff) | |
| download | systemd-6c34ed511173ae830784e4e49dc97a4d925451d2.tar.gz | |
test: use newer verb to set log levels
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-20-MAINPIDGAMES/testsuite.sh | 6 | ||||
| -rwxr-xr-x | test/TEST-23-TYPE-EXEC/testsuite.sh | 6 | ||||
| -rwxr-xr-x | test/TEST-27-STDOUTFILE/testsuite.sh | 6 | ||||
| -rwxr-xr-x | test/TEST-30-ONCLOCKCHANGE/testsuite.sh | 6 | ||||
| -rwxr-xr-x | test/networkd-test.py | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/test/TEST-20-MAINPIDGAMES/testsuite.sh b/test/TEST-20-MAINPIDGAMES/testsuite.sh index 0e1a116b07..b183ec9a6b 100755 --- a/test/TEST-20-MAINPIDGAMES/testsuite.sh +++ b/test/TEST-20-MAINPIDGAMES/testsuite.sh @@ -4,8 +4,8 @@ set -ex set -o pipefail -systemd-analyze set-log-level debug -systemd-analyze set-log-target console +systemd-analyze log-level debug +systemd-analyze log-target console test `systemctl show -p MainPID --value testsuite.service` -eq $$ @@ -134,7 +134,7 @@ chmod 755 /dev/shm/mainpid3.sh # Test that this failed due to timeout, and not some other error test `systemctl show -p Result --value mainpidsh3.service` = timeout -systemd-analyze set-log-level info +systemd-analyze log-level info echo OK > /testok diff --git a/test/TEST-23-TYPE-EXEC/testsuite.sh b/test/TEST-23-TYPE-EXEC/testsuite.sh index 80734bbbdc..4f7cc44310 100755 --- a/test/TEST-23-TYPE-EXEC/testsuite.sh +++ b/test/TEST-23-TYPE-EXEC/testsuite.sh @@ -4,8 +4,8 @@ set -ex set -o pipefail -systemd-analyze set-log-level debug -systemd-analyze set-log-target console +systemd-analyze log-level debug +systemd-analyze log-target console # Create a binary for which execve() will fail touch /tmp/brokenbinary @@ -21,7 +21,7 @@ systemd-run --unit=four -p Type=exec /bin/sleep infinity ! systemd-run --unit=five -p Type=exec -p User=idontexist /bin/sleep infinity ! systemd-run --unit=six -p Type=exec /tmp/brokenbinary -systemd-analyze set-log-level info +systemd-analyze log-level info echo OK > /testok diff --git a/test/TEST-27-STDOUTFILE/testsuite.sh b/test/TEST-27-STDOUTFILE/testsuite.sh index b8fcc46e33..6975b7966f 100755 --- a/test/TEST-27-STDOUTFILE/testsuite.sh +++ b/test/TEST-27-STDOUTFILE/testsuite.sh @@ -4,8 +4,8 @@ set -ex set -o pipefail -systemd-analyze set-log-level debug -systemd-analyze set-log-target console +systemd-analyze log-level debug +systemd-analyze log-target console systemd-run --wait --unit=one -p StandardOutput=file:/tmp/stdout -p StandardError=file:/tmp/stderr -p Type=exec sh -c 'echo x ; echo y >&2' cmp /tmp/stdout <<EOF @@ -33,7 +33,7 @@ a c EOF -systemd-analyze set-log-level info +systemd-analyze log-level info echo OK > /testok diff --git a/test/TEST-30-ONCLOCKCHANGE/testsuite.sh b/test/TEST-30-ONCLOCKCHANGE/testsuite.sh index 8ded85633a..3f7c264000 100755 --- a/test/TEST-30-ONCLOCKCHANGE/testsuite.sh +++ b/test/TEST-30-ONCLOCKCHANGE/testsuite.sh @@ -4,8 +4,8 @@ set -ex set -o pipefail -systemd-analyze set-log-level debug -systemd-analyze set-log-target console +systemd-analyze log-level debug +systemd-analyze log-target console systemctl disable --now systemd-timesyncd.service @@ -26,7 +26,7 @@ timedatectl set-time 2018-1-1 while ! test -f /tmp/clock-changed ; do sleep .5 ; done -systemd-analyze set-log-level info +systemd-analyze log-level info echo OK > /testok diff --git a/test/networkd-test.py b/test/networkd-test.py index 9af141fa65..8b1aeeda35 100755 --- a/test/networkd-test.py +++ b/test/networkd-test.py @@ -283,11 +283,11 @@ class ClientTestBase(NetworkdTestingUtilities): klass.orig_log_level = subprocess.check_output( ['systemctl', 'show', '--value', '--property', 'LogLevel'], universal_newlines=True).strip() - subprocess.check_call(['systemd-analyze', 'set-log-level', 'debug']) + subprocess.check_call(['systemd-analyze', 'log-level', 'debug']) @classmethod def tearDownClass(klass): - subprocess.check_call(['systemd-analyze', 'set-log-level', klass.orig_log_level]) + subprocess.check_call(['systemd-analyze', 'log-level', klass.orig_log_level]) def setUp(self): self.iface = 'test_eth42' |