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_help.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test/py/tests/test_help.py') diff --git a/test/py/tests/test_help.py b/test/py/tests/test_help.py index 2325ff69229..72f7282478c 100644 --- a/test/py/tests/test_help.py +++ b/test/py/tests/test_help.py @@ -4,35 +4,35 @@ import pytest -def test_help(u_boot_console): +def test_help(ubman): """Test that the "help" command can be executed.""" - lines = u_boot_console.run_command('help') - if u_boot_console.config.buildconfig.get('config_cmd_2048', 'n') == 'y': + lines = ubman.run_command('help') + if ubman.config.buildconfig.get('config_cmd_2048', 'n') == 'y': assert lines.splitlines()[0] == "2048 - The 2048 game" else: assert lines.splitlines()[0] == "? - alias for 'help'" @pytest.mark.boardspec('sandbox') -def test_help_no_devicetree(u_boot_console): +def test_help_no_devicetree(ubman): try: - cons = u_boot_console + cons = ubman cons.restart_uboot_with_flags([], use_dtb=False) cons.run_command('help') output = cons.get_spawn_output().replace('\r', '') assert 'print command description/usage' in output finally: # Restart afterward to get the normal device tree back - u_boot_console.restart_uboot() + ubman.restart_uboot() @pytest.mark.boardspec('sandbox_vpl') -def test_vpl_help(u_boot_console): +def test_vpl_help(ubman): try: - cons = u_boot_console + cons = ubman cons.restart_uboot() cons.run_command('help') output = cons.get_spawn_output().replace('\r', '') assert 'print command description/usage' in output finally: # Restart afterward to get the normal device tree back - u_boot_console.restart_uboot() + ubman.restart_uboot() -- cgit v1.2.3 From d08653d3699c1aafada3418c9f74b887bfb21a65 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 9 Feb 2025 09:07:17 -0700 Subject: test/py: Drop assigning ubman to cons Now that we have a shorter name, we don't need this sort of thing. Just use ubman instead. Signed-off-by: Simon Glass --- test/py/tests/test_help.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'test/py/tests/test_help.py') diff --git a/test/py/tests/test_help.py b/test/py/tests/test_help.py index 72f7282478c..12cb36b7b98 100644 --- a/test/py/tests/test_help.py +++ b/test/py/tests/test_help.py @@ -16,10 +16,9 @@ def test_help(ubman): @pytest.mark.boardspec('sandbox') def test_help_no_devicetree(ubman): try: - cons = ubman - cons.restart_uboot_with_flags([], use_dtb=False) - cons.run_command('help') - output = cons.get_spawn_output().replace('\r', '') + ubman.restart_uboot_with_flags([], use_dtb=False) + ubman.run_command('help') + output = ubman.get_spawn_output().replace('\r', '') assert 'print command description/usage' in output finally: # Restart afterward to get the normal device tree back @@ -28,10 +27,9 @@ def test_help_no_devicetree(ubman): @pytest.mark.boardspec('sandbox_vpl') def test_vpl_help(ubman): try: - cons = ubman - cons.restart_uboot() - cons.run_command('help') - output = cons.get_spawn_output().replace('\r', '') + ubman.restart_uboot() + ubman.run_command('help') + output = ubman.get_spawn_output().replace('\r', '') assert 'print command description/usage' in output finally: # Restart afterward to get the normal device tree back -- cgit v1.2.3