diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-03-25 14:09:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-25 14:09:16 +0100 |
| commit | 36c0d42d38120b6d154e6fd44343d23ee634a9e4 (patch) | |
| tree | 25585aa83b09b7e2672a4d5f7a2434b6a32371b3 /lib/oeqa/selftest/cases/testutils.py | |
| parent | 1d581dd2fc4f8e1082ac20fc11153664ceec5963 (diff) | |
| parent | 68820877358c54a232ef959a30af5ad8af1f3294 (diff) | |
| download | meta-updater-36c0d42d38120b6d154e6fd44343d23ee634a9e4.tar.gz | |
Merge pull request #699 from advancedtelematic/feat/2020.4
aktualizr: Bump to latest along with garage-sign.
Diffstat (limited to 'lib/oeqa/selftest/cases/testutils.py')
| -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') |