Merge remote-tracking branch 'ats/rocko' into sumo-candidate

1 files changed, 19 insertions, 8 deletions

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index e459ffb..2efef15 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -150,6 +150,8 @@ class AutoProvTests(OESelftestTestCase):
             self.meta_qemu = None
         self.append_config('MACHINE = "qemux86-64"')
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "')
+        # Test aktualizr-example-interface package.
+        self.append_config('IMAGE_INSTALL_append = " aktualizr-examples aktualizr-example-interface "')
         self.qemu, self.s = qemu_launch(machine='qemux86-64')
 
     def tearDownLocal(self):
@@ -174,15 +176,21 @@ class AutoProvTests(OESelftestTestCase):
         print(value)
         print('Checking output of aktualizr-info:')
         ran_ok = False
-        for delay in [0, 1, 2, 5, 10, 15]:
-            sleep(delay)
+        for delay in [1, 2, 5, 10, 15]:
             stdout, stderr, retcode = self.qemu_command('aktualizr-info')
             if retcode == 0 and stderr == b'':
                 ran_ok = True
                 break
+            sleep(delay)
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
 
         verifyProvisioned(self, machine)
+        # Test aktualizr-example-interface package.
+        stdout, stderr, retcode = self.qemu_command('aktualizr-info')
+        self.assertIn(b'hardware ID: example1', stdout,
+                      'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode())
+        self.assertIn(b'hardware ID: example2', stdout,
+                      'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode())
 
 
 class RpiTests(OESelftestTestCase):
@@ -312,12 +320,12 @@ class GrubTests(OESelftestTestCase):
         print(value)
         print('Checking output of aktualizr-info:')
         ran_ok = False
-        for delay in [0, 1, 2, 5, 10, 15]:
-            sleep(delay)
+        for delay in [1, 2, 5, 10, 15]:
             stdout, stderr, retcode = self.qemu_command('aktualizr-info')
             if retcode == 0 and stderr == b'':
                 ran_ok = True
                 break
+            sleep(delay)
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
 
         verifyProvisioned(self, machine)
@@ -364,11 +372,12 @@ class ImplProvTests(OESelftestTestCase):
         print(value)
         print('Checking output of aktualizr-info:')
         ran_ok = False
-        for delay in [0, 1, 2, 5, 10, 15]:
+        for delay in [1, 2, 5, 10, 15]:
             stdout, stderr, retcode = self.qemu_command('aktualizr-info')
             if retcode == 0 and stderr == b'':
                 ran_ok = True
                 break
+            sleep(delay)
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
         # Verify that device has NOT yet provisioned.
         self.assertIn(b'Couldn\'t load device ID', stdout,
@@ -435,11 +444,12 @@ class HsmTests(OESelftestTestCase):
         print(value)
         print('Checking output of aktualizr-info:')
         ran_ok = False
-        for delay in [0, 1, 2, 5, 10, 15]:
+        for delay in [1, 2, 5, 10, 15]:
             stdout, stderr, retcode = self.qemu_command('aktualizr-info')
             if retcode == 0 and stderr == b'':
                 ran_ok = True
                 break
+            sleep(delay)
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
         # Verify that device has NOT yet provisioned.
         self.assertIn(b'Couldn\'t load device ID', stdout,
@@ -589,6 +599,7 @@ class PrimaryTests(OESelftestTestCase):
         self.assertEqual(retcode, 0, "Unable to run aktualizr --help")
         self.assertEqual(stderr, b'', 'Error: ' + stderr.decode())
 
+
 def qemu_launch(efi=False, machine=None, imagename=None):
     logger = logging.getLogger("selftest")
     logger.info('Running bitbake to build core-image-minimal')
@@ -660,12 +671,12 @@ def akt_native_run(testInst, cmd, **kwargs):
 def verifyProvisioned(testInst, machine):
     # Verify that device HAS provisioned.
     ran_ok = False
-    for delay in [5, 5, 5, 5, 10]:
-        sleep(delay)
+    for delay in [5, 5, 5, 5, 10, 10, 10, 10]:
         stdout, stderr, retcode = testInst.qemu_command('aktualizr-info')
         if retcode == 0 and stderr == b'' and stdout.decode().find('Fetched metadata: yes') >= 0:
             ran_ok = True
             break
+        sleep(delay)
     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())