diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-21 08:56:38 +0100 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-02-21 08:56:38 +0100 |
commit | 2023bfbbe31d5bb2df6da2af66ff828b2321b1e4 (patch) | |
tree | 55b2f00c1fb1f1ac089300b53bb9d7b61a2154f9 /lib/oeqa/selftest | |
parent | fc84de73eb3f04f1e7600a1c86061af7f856e8d4 (diff) | |
download | meta-updater-2023bfbbe31d5bb2df6da2af66ff828b2321b1e4.tar.gz |
Fix minor logging issue.
No need for the extra bitbake of aktualizr-native.
Diffstat (limited to 'lib/oeqa/selftest')
-rw-r--r-- | lib/oeqa/selftest/updater.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/oeqa/selftest/updater.py b/lib/oeqa/selftest/updater.py index 8563e3b..1efbba9 100644 --- a/lib/oeqa/selftest/updater.py +++ b/lib/oeqa/selftest/updater.py | |||
@@ -250,16 +250,12 @@ class HsmTests(oeSelfTest): | |||
250 | 250 | ||
251 | @classmethod | 251 | @classmethod |
252 | def setUpClass(cls): | 252 | def setUpClass(cls): |
253 | logger = logging.getLogger("selftest") | ||
254 | bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'base_prefix', 'libdir', 'bindir'], | 253 | bb_vars = get_bb_vars(['SYSROOT_DESTDIR', 'base_prefix', 'libdir', 'bindir'], |
255 | 'aktualizr-native') | 254 | 'aktualizr-native') |
256 | cls.sysroot = bb_vars['SYSROOT_DESTDIR'] + bb_vars['base_prefix'] | 255 | cls.sysroot = bb_vars['SYSROOT_DESTDIR'] + bb_vars['base_prefix'] |
257 | cls.sysrootbin = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] | 256 | cls.sysrootbin = bb_vars['SYSROOT_DESTDIR'] + bb_vars['bindir'] |
258 | cls.libdir = bb_vars['libdir'] | 257 | cls.libdir = bb_vars['libdir'] |
259 | 258 | ||
260 | logger.info('Running bitbake to build aktualizr-native tools') | ||
261 | bitbake('aktualizr-native') | ||
262 | |||
263 | def setUpLocal(self): | 259 | def setUpLocal(self): |
264 | self.append_config('SOTA_CLIENT_PROV = "aktualizr-hsm-prov"') | 260 | self.append_config('SOTA_CLIENT_PROV = "aktualizr-hsm-prov"') |
265 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') | 261 | self.append_config('SOTA_CLIENT_FEATURES = "hsm"') |
@@ -378,7 +374,8 @@ class HsmTests(oeSelfTest): | |||
378 | m = p.search(stdout.decode()) | 374 | m = p.search(stdout.decode()) |
379 | self.assertTrue(m, 'Device ID could not be read: ' + stderr.decode() + stdout.decode()) | 375 | self.assertTrue(m, 'Device ID could not be read: ' + stderr.decode() + stdout.decode()) |
380 | self.assertGreater(m.lastindex, 0, 'Device ID could not be read: ' + stderr.decode() + stdout.decode()) | 376 | self.assertGreater(m.lastindex, 0, 'Device ID could not be read: ' + stderr.decode() + stdout.decode()) |
381 | self.logger.info('Device successfully provisioned with ID: ' + m.group(1)) | 377 | logger = logging.getLogger("selftest") |
378 | logger.info('Device successfully provisioned with ID: ' + m.group(1)) | ||
382 | 379 | ||
383 | 380 | ||
384 | def qemu_launch(efi=False, machine=None): | 381 | def qemu_launch(efi=False, machine=None): |