3 files changed, 17 insertions, 12 deletions

diff --git a/lib/oeqa/selftest/cases/qemucommand.py b/lib/oeqa/selftest/cases/qemucommand.py
new file mode 120000
index 0000000..075cdb8
--- /dev/null
+++ b/lib/oeqa/selftest/cases/qemucommand.py
@@ -0,0 +1 @@
+../../../../scripts/qemucommand.py
\ No newline at end of file
diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/cases/updater.py
index 8fbc857..b544762 100644
--- a/lib/oeqa/selftest/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -6,15 +6,16 @@ import subprocess
 import unittest
 from time import sleep
 
-from oeqa.selftest.base import oeSelfTest
+from oeqa.selftest.case import OESelftestTestCase
 from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars
-from oeqa.selftest.qemucommand import QemuCommand
+from qemucommand import QemuCommand
 
 
-class SotaToolsTests(oeSelfTest):
+class SotaToolsTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(SotaToolsTests, cls).setUpClass()
         logger = logging.getLogger("selftest")
         logger.info('Running bitbake to build aktualizr-native tools')
         bitbake('aktualizr-native')
@@ -29,7 +30,7 @@ class SotaToolsTests(oeSelfTest):
         akt_native_run(self, 'garage-sign --help')
 
 
-class GeneralTests(oeSelfTest):
+class GeneralTests(OESelftestTestCase):
 
     def test_feature_sota(self):
         result = get_bb_var('DISTRO_FEATURES').find('sota')
@@ -93,10 +94,11 @@ class GeneralTests(oeSelfTest):
         self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.")
 
 
-class AktualizrToolsTests(oeSelfTest):
+class AktualizrToolsTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(AktualizrToolsTests, cls).setUpClass()
         logger = logging.getLogger("selftest")
         logger.info('Running bitbake to build aktualizr-native tools')
         bitbake('aktualizr-native')
@@ -132,15 +134,17 @@ class AktualizrToolsTests(oeSelfTest):
         self.assertTrue(os.path.getsize(ca_path) > 0, "Client certificate at %s is empty." % ca_path)
 
 
-class QemuTests(oeSelfTest):
+class QemuTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(QemuTests, cls).setUpClass()
         cls.qemu, cls.s = qemu_launch(machine='qemux86-64')
 
     @classmethod
     def tearDownClass(cls):
         qemu_terminate(cls.s)
+        super(QemuTests, cls).tearDownClass()
 
     def qemu_command(self, command):
         return qemu_send_command(self.qemu.ssh_port, command)
@@ -168,12 +172,12 @@ class QemuTests(oeSelfTest):
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
 
 
-class GrubTests(oeSelfTest):
+class GrubTests(OESelftestTestCase):
 
     def setUpLocal(self):
         # This is a bit of a hack but I can't see a better option.
         path = os.path.abspath(os.path.dirname(__file__))
-        metadir = path + "/../../../../"
+        metadir = path + "/../../../../../"
         grub_config = 'OSTREE_BOOTLOADER = "grub"\nMACHINE = "intel-corei7-64"'
         self.append_config(grub_config)
         self.meta_intel = metadir + "meta-intel"
@@ -215,7 +219,7 @@ class GrubTests(oeSelfTest):
         self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode())
 
 
-class ImplProvTests(oeSelfTest):
+class ImplProvTests(OESelftestTestCase):
 
     def setUpLocal(self):
         self.append_config('SOTA_CLIENT_PROV = " aktualizr-implicit-prov "')
@@ -287,7 +291,7 @@ class ImplProvTests(oeSelfTest):
         logger.info('Device successfully provisioned with ID: ' + m.group(1))
 
 
-class HsmTests(oeSelfTest):
+class HsmTests(OESelftestTestCase):
 
     def setUpLocal(self):
         self.append_config('SOTA_CLIENT_PROV = "aktualizr-hsm-prov"')
@@ -311,7 +315,8 @@ class HsmTests(oeSelfTest):
         # Strip off line ending.
         value_str = stdout.decode()[:-1]
         self.assertEqual(value_str, machine,
-                         'MACHINE does not match hostname: ' + machine + ', ' + value_str)
+                         'MACHINE does not match hostname: ' + machine + ', ' + value_str +
+                         '\nIs tianocore ovmf installed?')
         print(value_str)
         print('Checking output of aktualizr-info:')
         ran_ok = False
diff --git a/lib/oeqa/selftest/qemucommand.py b/lib/oeqa/selftest/qemucommand.py
deleted file mode 120000
index bc06dde..0000000
--- a/lib/oeqa/selftest/qemucommand.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../scripts/qemucommand.py
\ No newline at end of file