diff options
| author | Patrick Vacek <patrickvacek@gmail.com> | 2020-03-26 14:03:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 14:03:33 +0100 |
| commit | 8997893dda6c01b7435470a6304205280e078d8c (patch) | |
| tree | 27e7d7159ec51e432abd5b0ef5dcb9d2a9acda38 /lib | |
| parent | bf39f0fec9ad410aa37d3001b11d9e731b39d6e7 (diff) | |
| parent | 86157900804116db0a91d73e309ce354381fd8b1 (diff) | |
| download | meta-updater-8997893dda6c01b7435470a6304205280e078d8c.tar.gz | |
Merge pull request #700 from advancedtelematic/feat/zeus/2020.4
Feat/zeus/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') |