Merge pull request #233 from advancedtelematic/bugfix/PRO-4252/rocko-selftest-fixes

Fix some basic oe-selftest errors.

2 files changed, 5 insertions, 3 deletions

diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py
index 7d7bde7..253320d 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/lib/oeqa/selftest/cases/updater.py
@@ -13,6 +13,7 @@ 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')
@@ -109,6 +110,7 @@ class QemuTests(OESelftestTestCase):
 
     @classmethod
     def setUpClass(cls):
+        super(QemuTests, cls).setUpClass()
         cls.qemu, cls.s = qemu_launch(machine='qemux86-64')
 
     @classmethod
@@ -140,7 +142,7 @@ 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"
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py
index 9a893d8..6b1106d 100644
--- a/scripts/qemucommand.py
+++ b/scripts/qemucommand.py
@@ -73,7 +73,7 @@ class QemuCommand(object):
             try:
                 check_output(['kvm-ok'])
                 self.kvm = True
-            except CalledProcessError:
+            except Exception:
                 self.kvm = False
         else:
             self.kvm = args.kvm
@@ -96,7 +96,7 @@ class QemuCommand(object):
             "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port,
             "-m", "1G",
             "-usb",
-            "-usbdevice", "tablet",
+            "-device", "usb-tablet",
             "-show-cursor",
             "-vga", "std",
             "-net", netuser,