test: use newer verb to set log levels

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-04-03 08:19:08 +02:00
parent 570ee29ce1
commit 6c34ed5111
5 changed files with 14 additions and 14 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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'