mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
systemd.py: increase default bus timeout
Use SYSTEMD_BUS_TIMEOUT to set default timeout to 240s to avoid timeout problem on slow qemu machines. (From OE-Core rev: a5b1dcabdd84915eb0527be4e7bd64ab46860d9d) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user