diff options
| -rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 4 | ||||
| -rw-r--r-- | scripts/qemucommand.py | 2 |
2 files changed, 4 insertions, 2 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): | |||
| 13 | 13 | ||
| 14 | @classmethod | 14 | @classmethod |
| 15 | def setUpClass(cls): | 15 | def setUpClass(cls): |
| 16 | super(SotaToolsTests, cls).setUpClass() | ||
| 16 | logger = logging.getLogger("selftest") | 17 | logger = logging.getLogger("selftest") |
| 17 | logger.info('Running bitbake to build aktualizr-native tools') | 18 | logger.info('Running bitbake to build aktualizr-native tools') |
| 18 | bitbake('aktualizr-native') | 19 | bitbake('aktualizr-native') |
| @@ -109,6 +110,7 @@ class QemuTests(OESelftestTestCase): | |||
| 109 | 110 | ||
| 110 | @classmethod | 111 | @classmethod |
| 111 | def setUpClass(cls): | 112 | def setUpClass(cls): |
| 113 | super(QemuTests, cls).setUpClass() | ||
| 112 | cls.qemu, cls.s = qemu_launch(machine='qemux86-64') | 114 | cls.qemu, cls.s = qemu_launch(machine='qemux86-64') |
| 113 | 115 | ||
| 114 | @classmethod | 116 | @classmethod |
| @@ -140,7 +142,7 @@ class GrubTests(OESelftestTestCase): | |||
| 140 | def setUpLocal(self): | 142 | def setUpLocal(self): |
| 141 | # This is a bit of a hack but I can't see a better option. | 143 | # This is a bit of a hack but I can't see a better option. |
| 142 | path = os.path.abspath(os.path.dirname(__file__)) | 144 | path = os.path.abspath(os.path.dirname(__file__)) |
| 143 | metadir = path + "/../../../../" | 145 | metadir = path + "/../../../../../" |
| 144 | grub_config = 'OSTREE_BOOTLOADER = "grub"\nMACHINE = "intel-corei7-64"' | 146 | grub_config = 'OSTREE_BOOTLOADER = "grub"\nMACHINE = "intel-corei7-64"' |
| 145 | self.append_config(grub_config) | 147 | self.append_config(grub_config) |
| 146 | self.meta_intel = metadir + "meta-intel" | 148 | self.meta_intel = metadir + "meta-intel" |
diff --git a/scripts/qemucommand.py b/scripts/qemucommand.py index 9a893d8..7ae9381 100644 --- a/scripts/qemucommand.py +++ b/scripts/qemucommand.py | |||
| @@ -96,7 +96,7 @@ class QemuCommand(object): | |||
| 96 | "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, | 96 | "-serial", "tcp:127.0.0.1:%d,server,nowait" % self.serial_port, |
| 97 | "-m", "1G", | 97 | "-m", "1G", |
| 98 | "-usb", | 98 | "-usb", |
| 99 | "-usbdevice", "tablet", | 99 | "-device", "usb-tablet", |
| 100 | "-show-cursor", | 100 | "-show-cursor", |
| 101 | "-vga", "std", | 101 | "-vga", "std", |
| 102 | "-net", netuser, | 102 | "-net", netuser, |
