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_scp03.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test/py/tests/test_scp03.py') diff --git a/test/py/tests/test_scp03.py b/test/py/tests/test_scp03.py index 1a104b365f7..799754ac54b 100644 --- a/test/py/tests/test_scp03.py +++ b/test/py/tests/test_scp03.py @@ -14,14 +14,14 @@ import pytest import u_boot_utils as util @pytest.mark.buildconfigspec('cmd_scp03') -def test_scp03(u_boot_console): +def test_scp03(ubman): """Enable and provision keys with SCP03 """ success_str1 = "SCP03 is enabled" success_str2 = "SCP03 is provisioned" - response = u_boot_console.run_command('scp03 enable') + response = ubman.run_command('scp03 enable') assert success_str1 in response - response = u_boot_console.run_command('scp03 provision') + response = ubman.run_command('scp03 provision') assert success_str2 in response -- cgit v1.2.3 From d9ed4b75add4b4ccc37cf32b54cd9c77f48e3396 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 9 Feb 2025 09:07:15 -0700 Subject: test/py: Drop u_boot_ prefix on test files We know this is U-Boot so the prefix serves no purpose other than to make things longer and harder to read. Drop it and rename the files. Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek # test_android / test_dfu --- test/py/tests/test_scp03.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/py/tests/test_scp03.py') diff --git a/test/py/tests/test_scp03.py b/test/py/tests/test_scp03.py index 799754ac54b..296d7c7d953 100644 --- a/test/py/tests/test_scp03.py +++ b/test/py/tests/test_scp03.py @@ -11,7 +11,7 @@ For additional details check doc/usage/scp03.rst """ import pytest -import u_boot_utils as util +import utils as util @pytest.mark.buildconfigspec('cmd_scp03') def test_scp03(ubman): -- cgit v1.2.3 From dd693ecb60384049dd8c3f6a36331c1a70b6558f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 9 Feb 2025 09:07:16 -0700 Subject: test/py: Drop importing utils as util Now that we have a shorter name, we don't need this sort of thing. Drop it. Signed-off-by: Simon Glass Reviewed-by: Mattijs Korpershoek # test_android --- test/py/tests/test_scp03.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/py/tests/test_scp03.py') diff --git a/test/py/tests/test_scp03.py b/test/py/tests/test_scp03.py index 296d7c7d953..414b4251a69 100644 --- a/test/py/tests/test_scp03.py +++ b/test/py/tests/test_scp03.py @@ -11,7 +11,7 @@ For additional details check doc/usage/scp03.rst """ import pytest -import utils as util +import utils @pytest.mark.buildconfigspec('cmd_scp03') def test_scp03(ubman): -- cgit v1.2.3