From a5b1dcabdd84915eb0527be4e7bd64ab46860d9d Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Tue, 31 Jul 2018 13:09:37 +0800 Subject: systemd.py: increase default bus timeout Use SYSTEMD_BUS_TIMEOUT to set default timeout to 240s to avoid timeout problem on slow qemu machines. Signed-off-by: Chen Qi --- meta/lib/oeqa/runtime/cases/systemd.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py index db69384c8a..460b8fc3a1 100644 --- a/meta/lib/oeqa/runtime/cases/systemd.py +++ b/meta/lib/oeqa/runtime/cases/systemd.py @@ -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: -- cgit 1.2.3-korg