From 752c3769874596d012cd8325099d2ae20123f989 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 9 Feb 2025 09:07:14 -0700 Subject: test/py: Shorten u_boot_console This fixture name is quite long and results in lots of verbose code. We know this is U-Boot so the 'u_boot_' part is not necessary. But it is also a bit of a misnomer, since it provides access to all the information available to tests. It is not just the console. It would be too confusing to use con as it would be confused with config and it is probably too short. So shorten it to 'ubman'. Signed-off-by: Simon Glass Link: https://lore.kernel.org/u-boot/CAFLszTgPa4aT_J9h9pqeTtLCVn4x2JvLWRcWRD8NaN3uoSAtyA@mail.gmail.com/ --- test/py/tests/test_sandbox_exit.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'test/py/tests/test_sandbox_exit.py') diff --git a/test/py/tests/test_sandbox_exit.py b/test/py/tests/test_sandbox_exit.py index 706f5fa3594..9610adf1fe7 100644 --- a/test/py/tests/test_sandbox_exit.py +++ b/test/py/tests/test_sandbox_exit.py @@ -7,39 +7,39 @@ import signal @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('sysreset_cmd_poweroff') -def test_poweroff(u_boot_console): +def test_poweroff(ubman): """Test that the "poweroff" command exits sandbox process.""" - u_boot_console.run_command('poweroff', wait_for_prompt=False) - assert(u_boot_console.validate_exited()) + ubman.run_command('poweroff', wait_for_prompt=False) + assert(ubman.validate_exited()) @pytest.mark.boardspec('sandbox') -def test_ctrl_c(u_boot_console): +def test_ctrl_c(ubman): """Test that sending SIGINT to sandbox causes it to exit.""" - u_boot_console.kill(signal.SIGINT) - assert(u_boot_console.validate_exited()) + ubman.kill(signal.SIGINT) + assert(ubman.validate_exited()) @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('cmd_exception') @pytest.mark.buildconfigspec('sandbox_crash_reset') -def test_exception_reset(u_boot_console): +def test_exception_reset(ubman): """Test that SIGILL causes a reset.""" - u_boot_console.run_command('exception undefined', wait_for_prompt=False) - m = u_boot_console.p.expect(['resetting ...', 'U-Boot']) + ubman.run_command('exception undefined', wait_for_prompt=False) + m = ubman.p.expect(['resetting ...', 'U-Boot']) if m != 0: raise Exception('SIGILL did not lead to reset') - m = u_boot_console.p.expect(['U-Boot', '=>']) + m = ubman.p.expect(['U-Boot', '=>']) if m != 0: raise Exception('SIGILL did not lead to reset') - u_boot_console.restart_uboot() + ubman.restart_uboot() @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('cmd_exception') @pytest.mark.notbuildconfigspec('sandbox_crash_reset') -def test_exception_exit(u_boot_console): +def test_exception_exit(ubman): """Test that SIGILL causes a reset.""" - u_boot_console.run_command('exception undefined', wait_for_prompt=False) - assert(u_boot_console.validate_exited()) + ubman.run_command('exception undefined', wait_for_prompt=False) + assert(ubman.validate_exited()) -- cgit v1.2.3