3 files changed, 16 insertions, 11 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 f28349f..9264616 100644
--- a/lib/oeqa/selftest/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -1,18 +1,19 @@
-import unittest
 import os
 import logging
 import subprocess
 import time
+import unittest
 
-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')
@@ -38,14 +39,15 @@ class SotaToolsTests(oeSelfTest):
         result = runCmd('%s --help' % p, ignore_status=True)
         self.assertEqual(result.status, 0, "Status not equal to 0. output: %s" % result.output)
 
-class HsmTests(oeSelfTest):
+
+class HsmTests(OESelftestTestCase):
 
     def test_hsm(self):
         self.write_config('SOTA_CLIENT_FEATURES="hsm"')
         bitbake('core-image-minimal')
 
 
-class GeneralTests(oeSelfTest):
+class GeneralTests(OESelftestTestCase):
 
     def test_feature_sota(self):
         result = get_bb_var('DISTRO_FEATURES').find('sota')
@@ -104,10 +106,11 @@ class GeneralTests(oeSelfTest):
         self.assertNotEqual(size1, size2, "Image sizes are identical; image was not rebuilt.")
 
 
-class QemuTests(oeSelfTest):
+class QemuTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(QemuTests, cls).setUpClass()
         cls.qemu, cls.s = qemu_launch(machine='qemux86-64')
 
     @classmethod
@@ -133,12 +136,13 @@ class QemuTests(oeSelfTest):
         self.assertEqual(err, b'', 'Error: ' + err.decode())
         print(value.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"
@@ -161,7 +165,8 @@ class GrubTests(oeSelfTest):
         # Strip off line ending.
         value_str = value.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)
 
 
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