From 2e91163d5947764c1b43655e90bde5e1d3b2c1b7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 26 Jun 2019 14:04:31 +0100 Subject: 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 --- meta/lib/oeqa/runtime/cases/oe_syslog.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/cases/oe_syslog.py b/meta/lib/oeqa/runtime/cases/oe_syslog.py index f987dccfb1..449df233d1 100644 --- a/meta/lib/oeqa/runtime/cases/oe_syslog.py +++ b/meta/lib/oeqa/runtime/cases/oe_syslog.py @@ -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 -- cgit v1.2.3-54-g00ecf