oeqa/runtime/systemd: remove race in settle()
PATCH 1/1 oeqa/runtime/systemd: remove race in settle()
The settle() function had a race where services could still be activating at two minutes but then when the final log is output, they've activated.
Remove this race and generally clean up the code.
Signed-off-by Ross Burton <[email protected]>
--- meta/lib/oeqa/runtime/systemd.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)
meta/lib/oeqa/runtime/systemd.py +8 -14
@@ -37,25 +37,19 @@ class SystemdBasicTests(SystemdTest): Block until systemd has finished activating any units being activated, or until two minutes has elapsed. - Returns a tuple, either (True, None) if all units have finished - acitvating, or (False, message string) if there are still units + Returns a tuple, either (True, '') if all units have finished + activating, or (False, message string) if there are still units activating (generally, failing units that restart). """ import time - settled = False endtime = time.time() + (60 * 2) - while time.time() < endtime: - status = self.target.run('systemctl --state=activating | grep -q "0 loaded units listed"') - if status == 0: - settled = True - break - time.sleep(10) - - if settled: - return (True, None) - else: + while True: status, output = self.target.run('systemctl --state=activating') - return (settled, output) + if "0 loaded units listed" in output: + return (True, '') + if time.time() >= endtime: + return (False, output) + time.sleep(10) @skipUnlessPassed('test_systemd_basic') def test_systemd_failed(self):
Signature · 1 line
1.7.10.4