[PATCH] oe_syslog.py: Handle syslogd/klogd restart race

[Jon Mason <jdmason@kudzu.us>]

syslogd and klogd can occasionally take too long to restart, which
causes tests to fail by starting before the log daemons are ready.  To
work around this problem, poll for up to 30 seconds on the processes to
verify the old ones are killed and the new ones are up and running.

[YOCTO #13379]

Signed-off-by: Jon Mason <jdmason@kudzu.us>
---
 meta/lib/oeqa/runtime/cases/oe_syslog.py | 37 ++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/meta/lib/oeqa/runtime/cases/oe_syslog.py b/meta/lib/oeqa/runtime/cases/oe_syslog.py
index 0f5f9f43ca..3270a0fc88 100644
--- a/meta/lib/oeqa/runtime/cases/oe_syslog.py
+++ b/meta/lib/oeqa/runtime/cases/oe_syslog.py
@@ -50,9 +50,46 @@ class SyslogTestConfig(OERuntimeTestCase):
     @skipIfDataVar('VIRTUAL-RUNTIME_init_manager', 'systemd',
                    'Not appropiate for systemd image')
     def test_syslog_startup_config(self):
+        status, syslogd_pid = self.target.run('pidof syslogd')
+        status, klogd_pid = self.target.run('pidof klogd')
+
         cmd = 'echo "LOGFILE=/var/log/test" >> /etc/syslog-startup.conf'
         self.target.run(cmd)
         status, output = self.target.run('/etc/init.d/syslog restart')
+
+        # Error, most likely a race between shutting down and starting up
+        if status:
+            import time
+            timeout = time.time() + 30
+
+            while time.time() < timeout:
+                time.sleep(1)
+                # Verify the old ones are no longer running
+                status, output = self.target.run('kill -0 %s' %syslogd_pid)
+                if not status:
+                    self.logger.debug("old syslogd is running")
+                    continue
+
+                status, output = self.target.run('kill -0 %s' %klogd_pid)
+                if not status:
+                    self.logger.debug("old klogd is running")
+                    continue
+
+                # Verify the new ones are running
+                status, new_syslogd_pid = self.target.run('pidof syslogd')
+                if status:
+                    self.logger.debug("new syslogd is not running")
+                    continue
+
+                status, new_klogd_pid = self.target.run('pidof klogd')
+                if status:
+                    self.logger.debug("new syslogd is not running")
+                    continue
+
+                # Everything is fine now, so keep running
+                status = 0
+                break
+
         msg = ('Could not restart syslog service. Status and output:'
                ' %s and %s' % (status,output))
         self.assertEqual(status, 0, msg)
-- 
2.21.0