diff options
| author | Stephen Warren <swarren@nvidia.com> | 2016-07-06 09:04:08 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-08 12:47:58 -0400 |
| commit | a82642f39856c0b9edb2545570b599a157b73f63 (patch) | |
| tree | 82830db7a316f1821aed829c11201e2494b7494a /test | |
| parent | eb9d3ca3560d9348f2db83beb2f51a85806519dd (diff) | |
| download | u-boot-a82642f39856c0b9edb2545570b599a157b73f63.tar.gz u-boot-a82642f39856c0b9edb2545570b599a157b73f63.tar.bz2 u-boot-a82642f39856c0b9edb2545570b599a157b73f63.zip | |
test/py: fix CONFIG_ tests
Some CONFIG_ variables were recently renamed, but test/py wasn't updated
to match. This causes some tests to be skipped. Fix test/py so the tests
are run.
Fixes: 11636258981a ("Rename reset to sysreset")
Fixes: f1f9d4fac527 ("hush: complete renaming CONFIG_SYS_HUSH_PARSER to CONFIG_HUSH_PARSER")
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/py/tests/test_hush_if_test.py | 8 | ||||
| -rw-r--r-- | test/py/tests/test_sandbox_exit.py | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py index 1eeaa5b047..b572538528 100644 --- a/test/py/tests/test_hush_if_test.py +++ b/test/py/tests/test_hush_if_test.py @@ -109,27 +109,27 @@ def exec_hush_if(u_boot_console, expr, result): response = u_boot_console.run_command(cmd) assert response.strip() == str(result).lower() -@pytest.mark.buildconfigspec('sys_hush_parser') +@pytest.mark.buildconfigspec('hush_parser') def test_hush_if_test_setup(u_boot_console): """Set up environment variables used during the "if" tests.""" u_boot_console.run_command('setenv ut_var_nonexistent') u_boot_console.run_command('setenv ut_var_exists 1') -@pytest.mark.buildconfigspec('sys_hush_parser') +@pytest.mark.buildconfigspec('hush_parser') @pytest.mark.parametrize('expr,result', subtests) def test_hush_if_test(u_boot_console, expr, result): """Test a single "if test" condition.""" exec_hush_if(u_boot_console, expr, result) -@pytest.mark.buildconfigspec('sys_hush_parser') +@pytest.mark.buildconfigspec('hush_parser') def test_hush_if_test_teardown(u_boot_console): """Clean up environment variables used during the "if" tests.""" u_boot_console.run_command('setenv ut_var_exists') -@pytest.mark.buildconfigspec('sys_hush_parser') +@pytest.mark.buildconfigspec('hush_parser') # We might test this on real filesystems via UMS, DFU, 'save', etc. # Of those, only UMS currently allows file removal though. @pytest.mark.boardspec('sandbox') diff --git a/test/py/tests/test_sandbox_exit.py b/test/py/tests/test_sandbox_exit.py index d1aa3083f4..4e333ecedb 100644 --- a/test/py/tests/test_sandbox_exit.py +++ b/test/py/tests/test_sandbox_exit.py @@ -7,7 +7,7 @@ import pytest import signal @pytest.mark.boardspec('sandbox') -@pytest.mark.buildconfigspec('reset') +@pytest.mark.buildconfigspec('sysreset') def test_reset(u_boot_console): """Test that the "reset" command exits sandbox process.""" |