[PATCH 1/3] test/py: Reset the console timeout value
Reset the console timeout value as some tests may change its default value during the execution.
This fixes the random case timeout issue seen in the U-Boot CI.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
test/py/u_boot_console_base.py | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 58ec859b34..26b6de07f8 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -400,6 +400,10 @@ class ConsoleBase(object): """
if self.p: + # Reset the console timeout value as some tests may change + # its default value during the execution + if not self.config.gdbserver: + self.p.timeout = 30000 return try: self.log.start_section('Starting U-Boot')
Use test_fstypes as the name instead of test_dm_compact.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
test/py/tests/test_fs/test_fs_cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/py/tests/test_fs/test_fs_cmd.py b/test/py/tests/test_fs/test_fs_cmd.py index ba39a53159..700cf3591d 100644 --- a/test/py/tests/test_fs/test_fs_cmd.py +++ b/test/py/tests/test_fs/test_fs_cmd.py @@ -6,7 +6,7 @@ import pytest
@pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('cmd_fs_generic') -def test_dm_compat(u_boot_console): +def test_fstypes(u_boot_console): """Test that `fstypes` prints a result which includes `sandbox`.""" output = u_boot_console.run_command('fstypes') assert "Supported filesystems:" in output
On Tue, May 17, 2022 at 11:24:44PM +0800, Bin Meng wrote:
Use test_fstypes as the name instead of test_dm_compact.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot/master, thanks!
Use test_part_types as the name instead of dm_compact.
Signed-off-by: Bin Meng bmeng.cn@gmail.com ---
test/py/tests/test_part.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/py/tests/test_part.py b/test/py/tests/test_part.py index cba9804510..2b5184654d 100644 --- a/test/py/tests/test_part.py +++ b/test/py/tests/test_part.py @@ -7,7 +7,7 @@ import pytest @pytest.mark.buildconfigspec('cmd_part') @pytest.mark.buildconfigspec('partitions') @pytest.mark.buildconfigspec('efi_partition') -def test_dm_compat(u_boot_console): +def test_part_types(u_boot_console): """Test that `part types` prints a result which includes `EFI`.""" output = u_boot_console.run_command('part types') assert "Supported partition tables:" in output
On Tue, May 17, 2022 at 11:24:45PM +0800, Bin Meng wrote:
Use test_part_types as the name instead of dm_compact.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot/master, thanks!
On Tue, May 17, 2022 at 11:24:43PM +0800, Bin Meng wrote:
Reset the console timeout value as some tests may change its default value during the execution.
This fixes the random case timeout issue seen in the U-Boot CI.
Signed-off-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot/master, thanks!
participants (2)
-
Bin Meng -
Tom Rini