aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-26 14:04:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-27 12:20:24 +0100
commitbe48190dca0643df4881624d29c2eae453395919 (patch)
tree25487549e5d88a689b5a646f9b53db59b4a7fb77
parentf19e95b8571a0d8213c4dec0da056e3d243fbbd1 (diff)
downloadopenembedded-core-contrib-be48190dca0643df4881624d29c2eae453395919.tar.gz
openembedded-core-contrib-be48190dca0643df4881624d29c2eae453395919.tar.bz2
openembedded-core-contrib-be48190dca0643df4881624d29c2eae453395919.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/runtime/cases/oe_syslog.py7
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