diff options
Diffstat (limited to 'lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py index 0f0f491..e9a1a65 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64_ptest.py | |||
@@ -1,10 +1,9 @@ | |||
1 | # pylint: disable=C0111,C0325 | 1 | # pylint: disable=C0111,C0325 |
2 | import os | ||
3 | import re | 2 | import re |
4 | 3 | ||
5 | from oeqa.selftest.case import OESelftestTestCase | 4 | from oeqa.selftest.case import OESelftestTestCase |
6 | from oeqa.utils.commands import runCmd | 5 | from oeqa.utils.commands import runCmd |
7 | from testutils import qemu_launch, qemu_send_command, qemu_terminate | 6 | from testutils import metadir, qemu_launch, qemu_send_command, qemu_terminate |
8 | 7 | ||
9 | 8 | ||
10 | class PtestTests(OESelftestTestCase): | 9 | class PtestTests(OESelftestTestCase): |
@@ -13,12 +12,7 @@ class PtestTests(OESelftestTestCase): | |||
13 | layer = "meta-updater-qemux86-64" | 12 | layer = "meta-updater-qemux86-64" |
14 | result = runCmd('bitbake-layers show-layers') | 13 | result = runCmd('bitbake-layers show-layers') |
15 | if re.search(layer, result.output) is None: | 14 | if re.search(layer, result.output) is None: |
16 | # Assume the directory layout for finding other layers. We could also | 15 | self.meta_qemu = metadir() + layer |
17 | # make assumptions by using 'show-layers', but either way, if the | ||
18 | # layers we need aren't where we expect them, we are out of like. | ||
19 | path = os.path.abspath(os.path.dirname(__file__)) | ||
20 | metadir = path + "/../../../../../" | ||
21 | self.meta_qemu = metadir + layer | ||
22 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 16 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
23 | else: | 17 | else: |
24 | self.meta_qemu = None | 18 | self.meta_qemu = None |
@@ -26,7 +20,8 @@ class PtestTests(OESelftestTestCase): | |||
26 | self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') | 20 | self.append_config('SYSTEMD_AUTO_ENABLE_aktualizr = "disable"') |
27 | self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') | 21 | self.append_config('PTEST_ENABLED_pn-aktualizr = "1"') |
28 | self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') | 22 | self.append_config('IMAGE_INSTALL_append += "aktualizr-ptest ptest-runner "') |
29 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 23 | self.append_config('IMAGE_FSTYPES_remove = "ostreepush garagesign garagecheck"') |
24 | self.qemu, self.s = qemu_launch(machine='qemux86-64', mem="256M") | ||
30 | 25 | ||
31 | def tearDownLocal(self): | 26 | def tearDownLocal(self): |
32 | qemu_terminate(self.s) | 27 | qemu_terminate(self.s) |