diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-12 15:57:20 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-12 15:57:20 -0500 |
| commit | c57ec2c2bab00c02a457ca70624c1333c60c2ec0 (patch) | |
| tree | 8b8b53585fd9bc655f32eba141f3c2d25d21d882 /test/py/tests | |
| parent | 668866aa24a87244e64be42f296959297ddc5014 (diff) | |
| parent | fc3283314539d6c3fb577359f6cb364c19c13726 (diff) | |
Merge branch '2021-03-12-test-improvements' into next
- Assorted improvements to the pytest framework
Diffstat (limited to 'test/py/tests')
| -rw-r--r-- | test/py/tests/test_log.py | 1 | ||||
| -rw-r--r-- | test/py/tests/test_ofplatdata.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/test/py/tests/test_log.py b/test/py/tests/test_log.py index f889120f2b..140dcb9aa2 100644 --- a/test/py/tests/test_log.py +++ b/test/py/tests/test_log.py @@ -45,5 +45,4 @@ def test_log_dropped(u_boot_console): cons = u_boot_console cons.restart_uboot() output = cons.get_spawn_output().replace('\r', '') - assert 'sandbox: starting...' in output assert (not 'debug: main' in output) diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py index 92d09b7aa1..e9cce4daf4 100644 --- a/test/py/tests/test_ofplatdata.py +++ b/test/py/tests/test_ofplatdata.py @@ -4,7 +4,7 @@ import pytest import u_boot_utils as util -@pytest.mark.boardspec('sandbox') +@pytest.mark.boardspec('sandbox_spl') @pytest.mark.buildconfigspec('spl_of_platdata') def test_spl_devicetree(u_boot_console): """Test content of spl device-tree""" |