oeqa/runtime/oesyslog: systemd syslog restart doesn't change pid

The systemd-journald process doesn't restart/change the way syslog
does, don't test/error in this case.

(From OE-Core rev: be48190dca0643df4881624d29c2eae453395919)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-06-26 14:04:31 +01:00
parent abfe4b3d5c
commit 2e91163d59

View 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