summaryrefslogtreecommitdiffstats
path: root/lib/oeqa
diff options
context:
space:
mode:
authorPatrick Vacek <patrickvacek@gmail.com>2019-07-24 17:01:29 +0200
committerGitHub <noreply@github.com>2019-07-24 17:01:29 +0200
commitedd1c685cebfcf3da112e621fc3c89a9a8d343bf (patch)
treed1357ad57bea4ae5464431bb82871f03f593136f /lib/oeqa
parent1e229a8747283d93eca0fc3c8ef90c52aca4187d (diff)
parentf90a3db48e5a0eb497823c23627c0a160df36380 (diff)
downloadmeta-updater-edd1c685cebfcf3da112e621fc3c89a9a8d343bf.tar.gz
Merge pull request #562 from advancedtelematic/feat/OTA-2844/oe-selftests-use-wait-until-provisioned
feat/OTA-2844/oe-selftests-use-wait-until-provisioned
Diffstat (limited to 'lib/oeqa')
-rw-r--r--lib/oeqa/selftest/cases/testutils.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py
index 8d618a6..28087ca 100644
--- a/lib/oeqa/selftest/cases/testutils.py
+++ b/lib/oeqa/selftest/cases/testutils.py
@@ -121,15 +121,21 @@ def verifyNotProvisioned(testInst, machine):
121 121
122def verifyProvisioned(testInst, machine): 122def verifyProvisioned(testInst, machine):
123 # Verify that device HAS provisioned. 123 # Verify that device HAS provisioned.
124 # First loop while waiting for the device to boot.
124 ran_ok = False 125 ran_ok = False
125 for delay in [5, 5, 5, 5, 10, 10, 10, 10]: 126 for delay in [5, 5, 5, 5, 10, 10, 10, 10]:
126 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') 127 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info')
127 if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0: 128 if retcode == 0 and stderr == b'':
128 ran_ok = True 129 ran_ok = True
129 break 130 break
130 sleep(delay) 131 sleep(delay)
131 testInst.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) 132 testInst.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
133 # Then wait for aktualizr to provision.
134 if stdout.decode().find('Fetched metadata: yes') < 0:
135 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info --wait-until-provisioned')
132 136
137 testInst.assertFalse(retcode, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
138 testInst.assertEqual(stderr, b'', 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
133 testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) 139 testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode())
134 testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, 140 testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout,
135 'Provisioning failed: ' + stderr.decode() + stdout.decode()) 141 'Provisioning failed: ' + stderr.decode() + stdout.decode())