diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2020-03-26 14:03:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 14:03:52 +0100 |
commit | 2d7393861c9f907c21ee12cbef814aa027fc97c5 (patch) | |
tree | 875e5aa0a55dbcd60c1bd08579693dfd123c905e /lib | |
parent | 64bf6f04f93f49160811e371d5ab572bad8621ae (diff) | |
parent | f481f2d72a6edbf7c9c0cc9568e1d669dc907966 (diff) | |
download | meta-updater-2d7393861c9f907c21ee12cbef814aa027fc97c5.tar.gz |
Merge pull request #702 from advancedtelematic/feat/thud/2020.4
Feat/thud/2020.4
Diffstat (limited to 'lib')
-rw-r--r-- | lib/oeqa/selftest/cases/testutils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/oeqa/selftest/cases/testutils.py b/lib/oeqa/selftest/cases/testutils.py index 3455fa8..3abfa5e 100644 --- a/lib/oeqa/selftest/cases/testutils.py +++ b/lib/oeqa/selftest/cases/testutils.py | |||
@@ -139,10 +139,10 @@ def verifyProvisioned(testInst, machine, hwid=''): | |||
139 | testInst.assertEqual(stderr, b'', 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) | 139 | testInst.assertEqual(stderr, b'', 'aktualizr-info failed: ' + stderr.decode() + stdout.decode()) |
140 | testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) | 140 | testInst.assertIn(b'Device ID: ', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) |
141 | if hwid == '': | 141 | if hwid == '': |
142 | testInst.assertIn(b'Primary ecu hardware ID: ' + machine.encode(), stdout, | 142 | testInst.assertIn(b'Primary ECU hardware ID: ' + machine.encode(), stdout, |
143 | 'Provisioning failed: ' + stderr.decode() + stdout.decode()) | 143 | 'Provisioning failed: ' + stderr.decode() + stdout.decode()) |
144 | else: | 144 | else: |
145 | testInst.assertIn(b'Primary ecu hardware ID: ' + hwid.encode(), stdout, | 145 | testInst.assertIn(b'Primary ECU hardware ID: ' + hwid.encode(), stdout, |
146 | 'Provisioning failed: ' + stderr.decode() + stdout.decode()) | 146 | 'Provisioning failed: ' + stderr.decode() + stdout.decode()) |
147 | testInst.assertIn(b'Fetched metadata: yes', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) | 147 | testInst.assertIn(b'Fetched metadata: yes', stdout, 'Provisioning failed: ' + stderr.decode() + stdout.decode()) |
148 | p = re.compile(r'Device ID: ([a-z0-9-]*)\n') | 148 | p = re.compile(r'Device ID: ([a-z0-9-]*)\n') |