diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-10-31 13:33:23 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-31 13:33:23 +0100 |
commit | d1a709a28fb4a708681bc3b2d868551b1910f1f3 (patch) | |
tree | b54d5d4577c01f269ea85ceff45934def6717e5b /lib | |
parent | 405c54c8effd39f8bd8a6a77d3ecd298b5196f25 (diff) | |
parent | f7c8b67ecf9b4983b380d107de98113f2af4d0cf (diff) | |
download | meta-updater-d1a709a28fb4a708681bc3b2d868551b1910f1f3.tar.gz |
Merge pull request #415 from advancedtelematic/refactor/rocko/rm-implicit-writer
Refactor/rocko/rm implicit writer
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oeqa/selftest/cases/updater.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/oeqa/selftest/cases/updater.py b/lib/oeqa/selftest/cases/updater.py index 7ef834e..3c17b8a 100644 --- a/lib/oeqa/selftest/cases/updater.py +++ b/lib/oeqa/selftest/cases/updater.py | |||
@@ -102,9 +102,6 @@ class AktualizrToolsTests(OESelftestTestCase): | |||
102 | logger.info('Running bitbake to build aktualizr-native tools') | 102 | logger.info('Running bitbake to build aktualizr-native tools') |
103 | bitbake('aktualizr-native') | 103 | bitbake('aktualizr-native') |
104 | 104 | ||
105 | def test_implicit_writer_help(self): | ||
106 | akt_native_run(self, 'aktualizr_implicit_writer --help') | ||
107 | |||
108 | def test_cert_provider_help(self): | 105 | def test_cert_provider_help(self): |
109 | akt_native_run(self, 'aktualizr_cert_provider --help') | 106 | akt_native_run(self, 'aktualizr_cert_provider --help') |
110 | 107 | ||
@@ -150,8 +147,6 @@ class AutoProvTests(OESelftestTestCase): | |||
150 | self.meta_qemu = None | 147 | self.meta_qemu = None |
151 | self.append_config('MACHINE = "qemux86-64"') | 148 | self.append_config('MACHINE = "qemux86-64"') |
152 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "') | 149 | self.append_config('SOTA_CLIENT_PROV = " aktualizr-auto-prov "') |
153 | # Test aktualizr-example-interface package. | ||
154 | self.append_config('IMAGE_INSTALL_append = " aktualizr-examples aktualizr-example-interface "') | ||
155 | self.qemu, self.s = qemu_launch(machine='qemux86-64') | 150 | self.qemu, self.s = qemu_launch(machine='qemux86-64') |
156 | 151 | ||
157 | def tearDownLocal(self): | 152 | def tearDownLocal(self): |
@@ -185,12 +180,6 @@ class AutoProvTests(OESelftestTestCase): | |||
185 | self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) | 180 | self.assertTrue(ran_ok, 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) |
186 | 181 | ||
187 | verifyProvisioned(self, machine) | 182 | verifyProvisioned(self, machine) |
188 | # Test aktualizr-example-interface package. | ||
189 | stdout, stderr, retcode = self.qemu_command('aktualizr-info') | ||
190 | self.assertIn(b'hardware ID: example1', stdout, | ||
191 | 'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode()) | ||
192 | self.assertIn(b'hardware ID: example2', stdout, | ||
193 | 'Legacy secondary initialization failed: ' + stderr.decode() + stdout.decode()) | ||
194 | 183 | ||
195 | 184 | ||
196 | class ManualControlTests(OESelftestTestCase): | 185 | class ManualControlTests(OESelftestTestCase): |
@@ -236,6 +225,7 @@ class ManualControlTests(OESelftestTestCase): | |||
236 | self.assertIn(b'Fetched metadata: yes', stdout, | 225 | self.assertIn(b'Fetched metadata: yes', stdout, |
237 | 'Aktualizr should have run' + stderr.decode() + stdout.decode()) | 226 | 'Aktualizr should have run' + stderr.decode() + stdout.decode()) |
238 | 227 | ||
228 | |||
239 | class RpiTests(OESelftestTestCase): | 229 | class RpiTests(OESelftestTestCase): |
240 | 230 | ||
241 | def setUpLocal(self): | 231 | def setUpLocal(self): |
@@ -562,6 +552,7 @@ class HsmTests(OESelftestTestCase): | |||
562 | 552 | ||
563 | verifyProvisioned(self, machine) | 553 | verifyProvisioned(self, machine) |
564 | 554 | ||
555 | |||
565 | class SecondaryTests(OESelftestTestCase): | 556 | class SecondaryTests(OESelftestTestCase): |
566 | @classmethod | 557 | @classmethod |
567 | def setUpClass(cls): | 558 | def setUpClass(cls): |