]> code.ossystems Code Review - openembedded-core.git/commitdiff
systemd.py: increase default bus timeout
authorChen Qi <Qi.Chen@windriver.com>
Tue, 31 Jul 2018 05:09:37 +0000 (13:09 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 31 Jul 2018 21:42:03 +0000 (22:42 +0100)
Use SYSTEMD_BUS_TIMEOUT to set default timeout to 240s to avoid
timeout problem on slow qemu machines.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
meta/lib/oeqa/runtime/cases/systemd.py

index db69384c8a0746f67ce5ccaddd49e83ac6019e59..460b8fc3a10ab04fd4e8464e1ecfd54555e4190a 100644 (file)
@@ -11,11 +11,11 @@ from oeqa.core.decorator.data import skipIfNotFeature
 class SystemdTest(OERuntimeTestCase):
 
     def systemctl(self, action='', target='', expected=0, verbose=False):
-        command = 'systemctl %s %s' % (action, target)
+        command = 'SYSTEMD_BUS_TIMEOUT=240s systemctl %s %s' % (action, target)
         status, output = self.target.run(command)
         message = '\n'.join([command, output])
         if status != expected and verbose:
-            cmd = 'systemctl status --full %s' % target
+            cmd = 'SYSTEMD_BUS_TIMEOUT=240s systemctl status --full %s' % target
             message += self.target.run(cmd)[1]
         self.assertEqual(status, expected, message)
         return output
@@ -63,7 +63,7 @@ class SystemdBasicTests(SystemdTest):
         """
         endtime = time.time() + (60 * 2)
         while True:
-            status, output = self.target.run('systemctl --state=activating')
+            status, output = self.target.run('SYSTEMD_BUS_TIMEOUT=240s systemctl --state=activating')
             if "0 loaded units listed" in output:
                 return (True, '')
             if time.time() >= endtime: