From 06c6f74138837a25f0eef2f0a8b4c3499a705eea Mon Sep 17 00:00:00 2001 From: Zee314159 <252806294@qq.com> Date: Wed, 24 Jul 2019 15:34:11 +0200 Subject: Removed unnecessary code and added comments Signed-off-by: Zee314159 <252806294@qq.com> --- lib/oeqa/selftest/cases/testutils.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py index 38e6033..6feb4e2 100644 --- a/lib/oeqa/selftest/cases/testutils.py +++ b/lib/oeqa/selftest/cases/testutils.py @@ -121,6 +121,7 @@ def verifyNotProvisioned(testInst, machine): def verifyProvisioned(testInst, machine): # Verify that device HAS provisioned. + # First loop while waiting for the device to boot. ran_ok = False for delay in [5, 5, 5, 5, 10, 10, 10, 10]: stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') @@ -129,13 +130,10 @@ def verifyProvisioned(testInst, machine): break sleep(delay) testInst.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) - - ran_ok = False + # Then wait for aktualizr to provision. if stdout.decode().find('Fetched metadata: yes') < 0: stdout, stderr, retcode = testInst.qemu_command('aktualizr-info --wait-until-provisioned') - if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0: - ran_ok = True - testInst.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) + testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) -- cgit v1.2.3-54-g00ecf