diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-01 09:23:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-01 09:23:21 -0400 |
| commit | 82679624f9aa6d1be733c46f3555d5166b6f5b72 (patch) | |
| tree | 8a99cf79bc520b833e155094ef134c0526b1f005 /test/py/tests/test_log.py | |
| parent | 412326d1bc2d346d7b4faad6fa547eaf065681a2 (diff) | |
| parent | 5d80a1a93d42c8325d65516cc654ff6a9ceec58a (diff) | |
Merge branch '2019-10-30-master-imports'
- Migrate test.py to use python3 and current pytest.
- NVMe bugfixes
- Assorted other fixes
- Android AVB updates.
Diffstat (limited to 'test/py/tests/test_log.py')
| -rw-r--r-- | test/py/tests/test_log.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index cb183444c6f..75325fad61a 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -27,9 +27,9 @@ def test_log(u_boot_console): """ for i in range(max_level): if mask & 1: - assert 'log_run() log %d' % i == lines.next() + assert 'log_run() log %d' % i == next(lines) if mask & 3: - assert 'func() _log %d' % i == lines.next() + assert 'func() _log %d' % i == next(lines) def run_test(testnum): """Run a particular test number (the 'log test' command) @@ -43,7 +43,7 @@ def test_log(u_boot_console): output = u_boot_console.run_command('log test %d' % testnum) split = output.replace('\r', '').splitlines() lines = iter(split) - assert 'test %d' % testnum == lines.next() + assert 'test %d' % testnum == next(lines) return lines def test0(): @@ -88,7 +88,7 @@ def test_log(u_boot_console): def test10(): lines = run_test(10) for i in range(7): - assert 'log_test() level %d' % i == lines.next() + assert 'log_test() level %d' % i == next(lines) # TODO(sjg@chromium.org): Consider structuring this as separate tests cons = u_boot_console |