diff options
Diffstat (limited to 'lib/oeqa/selftest/cases/updater_qemux86_64.py')
-rw-r--r-- | lib/oeqa/selftest/cases/updater_qemux86_64.py | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/lib/oeqa/selftest/cases/updater_qemux86_64.py b/lib/oeqa/selftest/cases/updater_qemux86_64.py index 04d9a6f..f09aa46 100644 --- a/lib/oeqa/selftest/cases/updater_qemux86_64.py +++ b/lib/oeqa/selftest/cases/updater_qemux86_64.py | |||
@@ -9,7 +9,8 @@ from uuid import uuid4 | |||
9 | from oeqa.selftest.case import OESelftestTestCase | 9 | from oeqa.selftest.case import OESelftestTestCase |
10 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars | 10 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars |
11 | from testutils import qemu_launch, qemu_send_command, qemu_terminate, \ | 11 | from testutils import qemu_launch, qemu_send_command, qemu_terminate, \ |
12 | akt_native_run, verifyNotProvisioned, verifyProvisioned, qemu_bake_image, qemu_boot_image | 12 | metadir, akt_native_run, verifyNotProvisioned, verifyProvisioned, \ |
13 | qemu_bake_image, qemu_boot_image | ||
13 | 14 | ||
14 | 15 | ||
15 | class GeneralTests(OESelftestTestCase): | 16 | class GeneralTests(OESelftestTestCase): |
@@ -46,8 +47,6 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
46 | akt_native_run(self, 'aktualizr-cert-provider --help') | 47 | akt_native_run(self, 'aktualizr-cert-provider --help') |
47 | 48 | ||
48 | def test_cert_provider_local_output(self): | 49 | def test_cert_provider_local_output(self): |
49 | logger = logging.getLogger("selftest") | ||
50 | logger.info('Running bitbake to build aktualizr-device-prov') | ||
51 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') | 50 | bb_vars = get_bb_vars(['SOTA_PACKED_CREDENTIALS', 'T'], 'aktualizr-native') |
52 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] | 51 | creds = bb_vars['SOTA_PACKED_CREDENTIALS'] |
53 | temp_dir = bb_vars['T'] | 52 | temp_dir = bb_vars['T'] |
@@ -75,12 +74,7 @@ class SharedCredProvTests(OESelftestTestCase): | |||
75 | layer = "meta-updater-qemux86-64" | 74 | layer = "meta-updater-qemux86-64" |
76 | result = runCmd('bitbake-layers show-layers') | 75 | result = runCmd('bitbake-layers show-layers') |
77 | if re.search(layer, result.output) is None: | 76 | if re.search(layer, result.output) is None: |
78 | # Assume the directory layout for finding other layers. We could also | 77 | self.meta_qemu = metadir() + layer |
79 | # make assumptions by using 'show-layers', but either way, if the | ||
80 | # layers we need aren't where we expect them, we are out of luck. | ||
81 | path = os.path.abspath(os.path.dirname(__file__)) | ||
82 | metadir = path + "/../../../../../" | ||
83 | self.meta_qemu = metadir + layer | ||
84 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 78 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
85 | else: | 79 | else: |
86 | self.meta_qemu = None | 80 | self.meta_qemu = None |
@@ -117,12 +111,7 @@ class ManualControlTests(OESelftestTestCase): | |||
117 | layer = "meta-updater-qemux86-64" | 111 | layer = "meta-updater-qemux86-64" |
118 | result = runCmd('bitbake-layers show-layers') | 112 | result = runCmd('bitbake-layers show-layers') |
119 | if re.search(layer, result.output) is None: | 113 | if re.search(layer, result.output) is None: |
120 | # Assume the directory layout for finding other layers. We could also | 114 | self.meta_qemu = metadir() + layer |
121 | # make assumptions by using 'show-layers', but either way, if the | ||
122 | # layers we need aren't where we expect them, we are out of like. | ||
123 | path = os.path.abspath(os.path.dirname(__file__)) | ||
124 | metadir = path + "/../../../../../" | ||
125 | self.meta_qemu = metadir + layer | ||
126 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 115 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
127 | else: | 116 | else: |
128 | self.meta_qemu = None | 117 | self.meta_qemu = None |
@@ -161,12 +150,7 @@ class DeviceCredProvTests(OESelftestTestCase): | |||
161 | layer = "meta-updater-qemux86-64" | 150 | layer = "meta-updater-qemux86-64" |
162 | result = runCmd('bitbake-layers show-layers') | 151 | result = runCmd('bitbake-layers show-layers') |
163 | if re.search(layer, result.output) is None: | 152 | if re.search(layer, result.output) is None: |
164 | # Assume the directory layout for finding other layers. We could also | 153 | self.meta_qemu = metadir() + layer |
165 | # make assumptions by using 'show-layers', but either way, if the | ||
166 | # layers we need aren't where we expect them, we are out of luck. | ||
167 | path = os.path.abspath(os.path.dirname(__file__)) | ||
168 | metadir = path + "/../../../../../" | ||
169 | self.meta_qemu = metadir + layer | ||
170 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 154 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
171 | else: | 155 | else: |
172 | self.meta_qemu = None | 156 | self.meta_qemu = None |
@@ -217,12 +201,7 @@ class DeviceCredProvHsmTests(OESelftestTestCase): | |||
217 | layer = "meta-updater-qemux86-64" | 201 | layer = "meta-updater-qemux86-64" |
218 | result = runCmd('bitbake-layers show-layers') | 202 | result = runCmd('bitbake-layers show-layers') |
219 | if re.search(layer, result.output) is None: | 203 | if re.search(layer, result.output) is None: |
220 | # Assume the directory layout for finding other layers. We could also | 204 | self.meta_qemu = metadir() + layer |
221 | # make assumptions by using 'show-layers', but either way, if the | ||
222 | # layers we need aren't where we expect them, we are out of luck. | ||
223 | path = os.path.abspath(os.path.dirname(__file__)) | ||
224 | metadir = path + "/../../../../../" | ||
225 | self.meta_qemu = metadir + layer | ||
226 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 205 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
227 | else: | 206 | else: |
228 | self.meta_qemu = None | 207 | self.meta_qemu = None |
@@ -399,12 +378,7 @@ class IpSecondaryTests(OESelftestTestCase): | |||
399 | layer = "meta-updater-qemux86-64" | 378 | layer = "meta-updater-qemux86-64" |
400 | result = runCmd('bitbake-layers show-layers') | 379 | result = runCmd('bitbake-layers show-layers') |
401 | if re.search(layer, result.output) is None: | 380 | if re.search(layer, result.output) is None: |
402 | # Assume the directory layout for finding other layers. We could also | 381 | self.meta_qemu = metadir() + layer |
403 | # make assumptions by using 'show-layers', but either way, if the | ||
404 | # layers we need aren't where we expect them, we are out of luck. | ||
405 | path = os.path.abspath(os.path.dirname(__file__)) | ||
406 | metadir = path + "/../../../../../" | ||
407 | self.meta_qemu = metadir + layer | ||
408 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 382 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
409 | else: | 383 | else: |
410 | self.meta_qemu = None | 384 | self.meta_qemu = None |
@@ -446,12 +420,7 @@ class ResourceControlTests(OESelftestTestCase): | |||
446 | layer = "meta-updater-qemux86-64" | 420 | layer = "meta-updater-qemux86-64" |
447 | result = runCmd('bitbake-layers show-layers') | 421 | result = runCmd('bitbake-layers show-layers') |
448 | if re.search(layer, result.output) is None: | 422 | if re.search(layer, result.output) is None: |
449 | # Assume the directory layout for finding other layers. We could also | 423 | self.meta_qemu = metadir() + layer |
450 | # make assumptions by using 'show-layers', but either way, if the | ||
451 | # layers we need aren't where we expect them, we are out of luck. | ||
452 | path = os.path.abspath(os.path.dirname(__file__)) | ||
453 | metadir = path + "/../../../../../" | ||
454 | self.meta_qemu = metadir + layer | ||
455 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) | 424 | runCmd('bitbake-layers add-layer "%s"' % self.meta_qemu) |
456 | else: | 425 | else: |
457 | self.meta_qemu = None | 426 | self.meta_qemu = None |