[OE-core] [PATCH 4/5] oeqa/runtime/oesyslog: systemd syslog restart doesn't change pid
Richard Purdie
richard.purdie at linuxfoundation.org
Wed Jun 26 16:30:43 UTC 2019
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 at linuxfoundation.org>
---
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 f987dccfb1b..449df233d13 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
--
2.20.1
More information about the Openembedded-core
mailing list