]> code.ossystems Code Review - openembedded-core.git/commitdiff
oeqa/runtime/oesyslog: systemd syslog restart doesn't change pid
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 26 Jun 2019 13:04:31 +0000 (14:04 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 27 Jun 2019 11:20:24 +0000 (12:20 +0100)
The systemd-journald process doesn't restart/change the way syslog
does, don't test/error in this case.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oeqa/runtime/cases/oe_syslog.py

index f987dccfb1b345f700b311d30917d2342b706f85..449df233d1316120b29e9b30483200c3de171ba5 100644 (file)
@@ -40,7 +40,7 @@ class SyslogTestConfig(OERuntimeTestCase):
         return 0, pids
 
 
-    def restart_sanity(self, names, restart_cmd):
+    def restart_sanity(self, names, restart_cmd, pidchange=True):
         status, original_pids = self.verify_running(names)
         if status:
             return False
@@ -50,6 +50,9 @@ class SyslogTestConfig(OERuntimeTestCase):
         msg = ('Could not restart %s service. Status and output: %s and %s' % (names, status, output))
         self.assertEqual(status, 0, msg)
 
+        if not pidchange:
+            return True
+
         # Always check for an error, most likely a race between shutting down and starting up
         timeout = time.time() + 30
 
@@ -95,7 +98,7 @@ class SyslogTestConfig(OERuntimeTestCase):
 
     @OETestDepends(['oe_syslog.SyslogTest.test_syslog_running'])
     def test_syslog_restart(self):
-        if self.restart_sanity(['systemd-journald'], 'systemctl restart syslog.service'):
+        if self.restart_sanity(['systemd-journald'], 'systemctl restart syslog.service', pidchange=False):
             pass
         elif self.restart_sanity(['rsyslogd'], '/etc/init.d/rsyslog restart'):
             pass