test: use newer verb to set log levels

diff --git a/test/TEST-20-MAINPIDGAMES/testsuite.sh b/test/TEST-20-MAINPIDGAMES/testsuite.sh
index 0e1a116b07f62739fa0a31501c7e664df60d617b..b183ec9a6b05803344a015af112140d36a12087e 100755 (executable)
--- 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 80734bbbdc3774fdea966d45c37c27a97a3b9847..4f7cc44310f4237a5faa1a2e6f9f9997a20ce917 100755 (executable)
--- 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 b8fcc46e336cc1337de9c23a862f87b72f7649bc..6975b7966f234fa1a038c0ecd12e6bcd92744f7d 100755 (executable)
--- 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 8ded85633affacbe7b02a669c8bc295da05b3bce..3f7c264000540ab3cca5a8f2855986240f117708 100755 (executable)
--- 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 9af141fa654c461c1c4a8fe871ba2d9a2b1bf76e..8b1aeeda35b15059a7603248b97c39feda9df422 100755 (executable)
--- 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'