diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-26 14:04:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-27 12:20:36 +0100 |
commit | 2e91163d5947764c1b43655e90bde5e1d3b2c1b7 (patch) | |
tree | 229afa7450fa6a1e06a094a4e8eec4244f3264a3 /meta/lib | |
parent | abfe4b3d5cd8d05c8ab99240e30ac281725fac14 (diff) | |
download | openembedded-core-contrib-2e91163d5947764c1b43655e90bde5e1d3b2c1b7.tar.gz |
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>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oeqa/runtime/cases/oe_syslog.py | 7 |
1 files 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 |