summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZee314159 <252806294@qq.com>2019-07-17 15:19:29 +0200
committerZee314159 <252806294@qq.com>2019-07-18 06:03:58 +0200
commit7bb9224cafa2586ea9a44bad24d794ac5daa957e (patch)
tree6979d3cdca5a0316c53882f1ced8f884a2d46087
parent567ed002259985b5a2afea2f90e5bf2df08f7147 (diff)
downloadmeta-updater-feat/OTA-2844/akt-info-wait-until-provisioned.tar.gz
update oe-selftests to use wait-until-provisionedfeat/OTA-2844/akt-info-wait-until-provisioned
Signed-off-by: Zee314159 <252806294@qq.com>
-rw-r--r--lib/oeqa/selftest/cases/testutils.py4
-rw-r--r--lib/oeqa/selftest/cases/updater_qemux86_64.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py
index f8b1904..7ca7361 100644
--- a/lib/oeqa/selftest/cases/testutils.py
+++ b/lib/oeqa/selftest/cases/testutils.py
@@ -93,7 +93,7 @@ def verifyNotProvisioned(testInst, machine):
93 print('Checking output of aktualizr-info:') 93 print('Checking output of aktualizr-info:')
94 ran_ok = False 94 ran_ok = False
95 for delay in [5, 5, 5, 5, 10, 10, 10, 10]: 95 for delay in [5, 5, 5, 5, 10, 10, 10, 10]:
96 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') 96 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info --wait-until-provisioned')
97 if retcode == 0 and stderr == b'': 97 if retcode == 0 and stderr == b'':
98 ran_ok = True 98 ran_ok = True
99 break 99 break
@@ -115,7 +115,7 @@ def verifyProvisioned(testInst, machine):
115 # Verify that device HAS provisioned. 115 # Verify that device HAS provisioned.
116 ran_ok = False 116 ran_ok = False
117 for delay in [5, 5, 5, 5, 10, 10, 10, 10]: 117 for delay in [5, 5, 5, 5, 10, 10, 10, 10]:
118 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info') 118 stdout, stderr, retcode = testInst.qemu_command('aktualizr-info --wait-until-provisioned')
119 if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0: 119 if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0:
120 ran_ok = True 120 ran_ok = True
121 break 121 break
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py
index 218d361..0617f8d 100644
--- a/lib/oeqa/selftest/cases/updater_qemux86_64.py
+++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py
@@ -150,7 +150,7 @@ class ManualControlTests(OESelftestTestCase):
150 150
151 stdout, stderr, retcode = self.qemu_command('aktualizr once') 151 stdout, stderr, retcode = self.qemu_command('aktualizr once')
152 152
153 stdout, stderr, retcode = self.qemu_command('aktualizr-info') 153 stdout, stderr, retcode = self.qemu_command('aktualizr-info --wait-until-provisioned')
154 self.assertIn(b'Fetched metadata: yes', stdout, 154 self.assertIn(b'Fetched metadata: yes', stdout,
155 'Aktualizr should have run' + stderr.decode() + stdout.decode()) 155 'Aktualizr should have run' + stderr.decode() + stdout.decode())
156 156