cmd: cat: add new command
PATCH v4 1/1 cmd: cat: add new command
Add cat command to print file content to standard out
---
v4:
- Return only values from enum command_ret_t in do_cat()
- Use calloc() instead of malloc() for zero initialized memory
- Make use of CONFIG_SYS_LONGHELP
- Improved error messages
v3:
- Disable 'cat' by default (CONFIG_CMD_CAT=n)
- Enable 'cat' in sandbox and sandbox64 defconfig
- Use map_to_sysmem() to fix "phys_to_virt: Cannot map sandbox address"
- Use puts() instead of a loop
- Added python test
- Addd usage documentation
v2:
- Moved cat from boot to shell commands
- Added MAINTAINERS entry
- Added comments
- Improved variable naming
MAINTAINERS | 5 ++ cmd/Kconfig | 6 ++ cmd/Makefile | 1 + cmd/cat.c | 88 ++++++++++++++++++++++++++++++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + doc/usage/cmd/cat.rst | 49 +++++++++++++++++ test/py/tests/test_cat/conftest.py | 33 +++++++++++ test/py/tests/test_cat/test_cat.py | 22 ++++++++ 9 files changed, 206 insertions(+) create mode 100644 cmd/cat.c create mode 100644 doc/usage/cmd/cat.rst create mode 100644 test/py/tests/test_cat/conftest.py create mode 100644 test/py/tests/test_cat/test_cat.py
MAINTAINERS +5 -0
@@ -765,6 +765,11 @@ M: Simon Glass <[email protected]> S: Maintained F: tools/buildman/ +CAT +M: Roger Knecht <[email protected]> +S: Maintained +F: cmd/cat.c + CFI FLASH M: Stefan Roese <[email protected]> S: Maintained
cmd/Kconfig +6 -0
@@ -1531,6 +1531,12 @@ endmenu menu "Shell scripting commands" +config CMD_CAT + bool "cat" + default n + help + Print file to standard output + config CMD_ECHO bool "echo" default y
cmd/Makefile +1 -0
@@ -38,6 +38,7 @@ obj-$(CONFIG_CMD_BOOTZ) += bootz.o obj-$(CONFIG_CMD_BOOTI) += booti.o obj-$(CONFIG_CMD_BTRFS) += btrfs.o obj-$(CONFIG_CMD_BUTTON) += button.o +obj-$(CONFIG_CMD_CAT) += cat.o obj-$(CONFIG_CMD_CACHE) += cache.o obj-$(CONFIG_CMD_CBFS) += cbfs.o obj-$(CONFIG_CMD_CLK) += clk.o
cmd/cat.c new file +88 -0
88 lines not on this page · raw message
configs/sandbox64_defconfig +1 -0
@@ -22,6 +22,7 @@ CONFIG_CONSOLE_RECORD=y CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_CMD_CAT=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTZ=y
configs/sandbox_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_LOG_DEFAULT_LEVEL=6 CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_STACKPROTECTOR=y CONFIG_ANDROID_AB=y +CONFIG_CMD_CAT=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTM_PRE_LOAD=y
doc/usage/cmd/cat.rst new file +49 -0
49 lines not on this page · raw message
test/py/tests/test_cat/conftest.py new file +33 -0
@@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0+ + +"""Fixture for cat command test +""" + +import os +import shutil +from subprocess import check_call +import pytest + [email protected](scope='session') +def cat_data(u_boot_config): + """Set up a file system to be used in cat tests + + Args: + u_boot_config -- U-boot configuration. + + Return: + A path to disk image to be used for testing + """ + mnt_point = u_boot_config.persistent_data_dir + '/test_cat' + image_path = u_boot_config.persistent_data_dir + '/cat.img' + + shutil.rmtree(mnt_point, ignore_errors=True) + os.mkdir(mnt_point, mode = 0o755) + + with open(mnt_point + '/hello', 'w', encoding = 'ascii') as file: + file.write('hello world\n') + + check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}', + shell=True) + + return image_path
test/py/tests/test_cat/test_cat.py new file +22 -0
@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0+ + +""" Unit test for cat command +""" + +import pytest + [email protected]('sandbox') [email protected]('cmd_cat') +def test_cat(u_boot_console, cat_data): + """ Unit test for cat + + Args: + u_boot_console -- U-Boot console + cat_data -- Path to the disk image used for testing. + """ + u_boot_console.run_command(cmd = f'host bind 0 {cat_data}') + + response = u_boot_console.run_command(cmd = 'cat host 0 hello') + assert 'hello world' == response + + u_boot_console.run_command(cmd = 'exit', wait_for_echo=False)
--
2.25.1
Hi Roger,
Quoted 25 lines · Roger Knecht
Add cat command to print file content to standard out
Signed-off-by Roger Knecht <[email protected]>---
v4:
- Return only values from enumcommand_ret_tindo_cat()
- Usecalloc()instead ofmalloc()for zero initialized memory
- Make use ofCONFIG_SYS_LONGHELP
- Improved error messagesv3:
- Disable 'cat' by default (CONFIG_CMD_CAT=n)
- Enable 'cat' in sandbox and sandbox64 defconfig
- Usemap_to_sysmem()to fix "phys_to_virt: Cannot map sandbox address"
- Useputs()instead of a loop
- Added python test
- Addd usage documentationv2:
- Moved cat from boot to shell commands
- AddedMAINTAINERSentry
- Added comments
- Improved variable naming
Quoted 14 lines
MAINTAINERS | 5 ++ cmd/Kconfig | 6 ++ cmd/Makefile | 1 + cmd/cat.c | 88 ++++++++++++++++++++++++++++++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + doc/usage/cmd/cat.rst | 49 +++++++++++++++++ test/py/tests/test_cat/conftest.py | 33 +++++++++++ test/py/tests/test_cat/test_cat.py | 22 ++++++++ 9 files changed, 206 insertions(+) create mode 100644 cmd/cat.c create mode 100644 doc/usage/cmd/cat.rst create mode 100644 test/py/tests/test_cat/conftest.py create mode 100644 test/py/tests/test_cat/test_cat.py
Quoted 6 lines
test/py/tests/test_cat/test_cat.py new file +0
-0@@ -0,0 +1,22 @@
[..]
Quoted 1 line
+
u_boot_console.run_command(cmd = 'exit', wait_for_echo=False)
What is that for?
Regards,
SImon
Quoted 284 lines · Roger Knecht
Add cat command to print file content to standard out
Signed-off-by Roger Knecht <[email protected]>---
v4:
- Return only values from enumcommand_ret_tindo_cat()
- Usecalloc()instead ofmalloc()for zero initialized memory
- Make use ofCONFIG_SYS_LONGHELP
- Improved error messagesv3:
- Disable 'cat' by default (CONFIG_CMD_CAT=n)
- Enable 'cat' in sandbox and sandbox64 defconfig
- Usemap_to_sysmem()to fix "phys_to_virt: Cannot map sandbox address"
- Useputs()instead of a loop
- Added python test
- Addd usage documentationv2:
- Moved cat from boot to shell commands
- AddedMAINTAINERSentry
- Added comments
- Improved variable namingMAINTAINERS | 5 ++ cmd/Kconfig | 6 ++ cmd/Makefile | 1 + cmd/cat.c | 88 ++++++++++++++++++++++++++++++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + doc/usage/cmd/cat.rst | 49 +++++++++++++++++ test/py/tests/test_cat/conftest.py | 33 +++++++++++ test/py/tests/test_cat/test_cat.py | 22 ++++++++ 9 files changed, 206 insertions(+)create mode 100644
cmd/cat.c
create mode 100644doc/usage/cmd/cat.rstcreate mode 100644test/py/tests/test_cat/conftest.pycreate mode 100644test/py/tests/test_cat/test_cat.pyMAINTAINERS +5
-0@@ -765,6 +765,11 @@ M: Simon Glass <[email protected]> S: Maintained F: tools/buildman/ +CAT +M: Roger Knecht <[email protected]> +S: Maintained +F: cmd/cat.c + CFI FLASH M: Stefan Roese <[email protected]> S: Maintainedcmd/Kconfig +6
-0@@ -1531,6 +1531,12 @@ endmenu menu "Shell scripting commands" +config CMD_CAT + bool "cat" + default n + help + Print file to standard output + config CMD_ECHO bool "echo" default ycmd/Makefile +1
-0@@ -38,6 +38,7 @@ obj-$(CONFIG_CMD_BOOTZ) += bootz.o obj-$(CONFIG_CMD_BOOTI) += booti.o obj-$(CONFIG_CMD_BTRFS) += btrfs.o obj-$(CONFIG_CMD_BUTTON) += button.o +obj-$(CONFIG_CMD_CAT) += cat.o obj-$(CONFIG_CMD_CACHE) += cache.o obj-$(CONFIG_CMD_CBFS) += cbfs.o obj-$(CONFIG_CMD_CLK) += clk.ocmd/cat.c new file +88
-0@@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2022 +* Roger Knecht <[email protected]> +*/ + +#include <common.h> +#include <command.h> +#include <fs.h> +#include <malloc.h> +#include <mapmem.h> + +static int do_cat (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +char *ifname; +char *dev; +char *file; +char *buffer; +phys_addr_t buffer_sysmem_addr; +loff_t file_size; + +if (argc <4 ) +return CMD_RET_USAGE ; + + ifname = argv[1 ]; + dev = argv[2 ]; + file = argv[3 ]; + +// check file exists +if (fs_set_blk_dev (ifname, dev,FS_TYPE_ANY )) +return CMD_RET_FAILURE ; + +if (!fs_exists (file)) { +log_err ("File does not exist: ifname=%s dev=%s file=%s\n" , ifname, dev, file); +return CMD_RET_FAILURE ; + } + +// get file size +if (fs_set_blk_dev (ifname, dev,FS_TYPE_ANY )) +return CMD_RET_FAILURE ; + +if (fs_size (file, &file_size)) { +log_err ("Cannot read file size: ifname=%s dev=%s file=%s\n" , ifname, dev, file); +return CMD_RET_FAILURE ; + } + +// allocate memory for file content + buffer =calloc (sizeof (char ), file_size +1 ); +if (!buffer) { +log_err ("Out of memory\n" ); +return CMD_RET_FAILURE ; + } + +// map pointer to system memory + buffer_sysmem_addr =map_to_sysmem (buffer); + +// read file to memory +if (fs_set_blk_dev (ifname, dev,FS_TYPE_ANY )) +return CMD_RET_FAILURE ; + +if (fs_read (file, buffer_sysmem_addr,0 ,0 , &file_size)) { +log_err ("Cannot read file: ifname=%s dev=%s file=%s\n" , ifname, dev, file); +return CMD_RET_FAILURE ; + } + +// unmap system memory +unmap_sysmem (buffer); + +// print file content + buffer[file_size] ='\0' ; +puts (buffer); + +free (buffer); + +return 0 ; +} + +#ifdef CONFIG_SYS_LONGHELP +static char cat_help_text[] = +"<interface> <dev[:part]> <file>\n" +" - Print file from 'dev' on 'interface' to standard output\n" ; +#endif + +U_BOOT_CMD (cat,4 ,1 , do_cat, +"Print file to standard output" , + cat_help_text +);configs/sandbox64_defconfig +1
-0@@ -22,6 +22,7 @@ CONFIG_CONSOLE_RECORD=y CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000 CONFIG_PRE_CONSOLE_BUFFER=y CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_CMD_CAT=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTZ=yconfigs/sandbox_defconfig +1
-0@@ -36,6 +36,7 @@ CONFIG_LOG_DEFAULT_LEVEL=6 CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_STACKPROTECTOR=y CONFIG_ANDROID_AB=y +CONFIG_CMD_CAT=y CONFIG_CMD_CPU=y CONFIG_CMD_LICENSE=y CONFIG_CMD_BOOTM_PRE_LOAD=ydoc/usage/cmd/cat.rst new file +49
-0@@ -0,0 +1,49 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +cat command +=============== + +Synopsis +-------- + +:: + + cat <interface> <dev[:part]> <file> + +Description +----------- + +The cat command prints the file content to standard out. + +interface + interface for accessing the block device (mmc, sata, scsi, usb, ....) + +dev + device number + +part + partition number, defaults to 1 + +file + path to file + +Example +------- + +Here is the output for a example text file: + +:: + + => cat mmc 0:1 hello + hello world + => + +Configuration +------------- + +The cat command is only available if CONFIG_CMD_CAT=y. + +Return value +------------ + +The return value $? is set to 0 (true) if the file is readable, otherwise it returns a non-zero error code.test/py/tests/test_cat/conftest.py new file +21
-0@@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0+ + +"""Fixture for cat command test +""" + +import os +import shutil +from subprocess import check_call +import pytest + [email protected](scope='session') +def cat_data(u_boot_config): + """Set up a file system to be used in cat tests + + Args: + u_boot_config -- U-boot configuration. + + Return: + A path to disk image to be used for testing + """ + mnt_point = u_boot_config.persistent_data_dir + '/test_cat'
test/py/tests/test_cat/conftest.py line 31
Quoted 10 lines
test/py/tests/test_cat/conftest.py new file +10
-0+ image_path = u_boot_config.persistent_data_dir + '/cat.img' + + shutil.rmtree(mnt_point, ignore_errors=True) + os.mkdir(mnt_point, mode = 0o755) + + with open(mnt_point + '/hello', 'w', encoding = 'ascii') as file: + file.write('hello world\n') + + check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}', + shell=True)
Best practice is to remove test data after usage. You could follow this pattern:
@pytest.fixture()
def resource():
print("setup")
yield "resource"
print("teardown")See
https://docs.pytest.org/en/latest/how-to/fixtures.html#teardown-cleanup-aka-fixture-finalization
virt-make-fs fails if the user has no read access to the kernel. So you should handle CalledProcessError like in test/py/tests/test_fs/conftest.py
Quoted 20 lines
test/py/tests/test_cat/conftest.py new file +2
-0+ + return image_pathtest/py/tests/test_cat/test_cat.py new file +12
-0@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0+ + +""" Unit test for cat command +""" + +import pytest + [email protected]('sandbox') [email protected]('cmd_cat') +def test_cat(u_boot_console, cat_data): + """ Unit test for cat +
test/py/tests/test_cat/test_cat.py line 22
Quoted 10 lines
test/py/tests/test_cat/test_cat.py new file +10
-0+ Args: + u_boot_console -- U-Boot console + cat_data -- Path to the disk image used for testing. + """ + u_boot_console.run_command(cmd = f'host bind 0 {cat_data}') + + response = u_boot_console.run_command(cmd = 'cat host 0 hello') + assert 'hello world' == response + + u_boot_console.run_command(cmd = 'exit', wait_for_echo=False)
As Simon already indicated this line should be removed.
Best regards
Heinrich
Quoted 4 lines
--
2.25.1
------- Original Message -------
Quoted 309 lines · Heinrich Schuchardt
Quoted 284 lines · Roger Knecht
Add cat command to print file content to standard out
Signed-off-by Roger Knecht [email protected]---
v4:
- Return only values from enumcommand_ret_tindo_cat()
- Usecalloc()instead ofmalloc()for zero initialized memory
- Make use ofCONFIG_SYS_LONGHELP
- Improved error messagesv3:
- Disable 'cat' by default (CONFIG_CMD_CAT=n)
- Enable 'cat' in sandbox and sandbox64 defconfig
- Usemap_to_sysmem()to fix "phys_to_virt: Cannot map sandbox address"
- Useputs()instead of a loop
- Added python test
- Addd usage documentationv2:
- Moved cat from boot to shell commands
- AddedMAINTAINERSentry
- Added comments
- Improved variable naming
MAINTAINERS| 5 ++
cmd/Kconfig | 6 ++
cmd/Makefile | 1 +cmd/cat.c| 88 ++++++++++++++++++++++++++++++ configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 +doc/usage/cmd/cat.rst| 49 +++++++++++++++++test/py/tests/test_cat/conftest.py| 33 +++++++++++test/py/tests/test_cat/test_cat.py| 22 ++++++++9 files changed, 206 insertions(+)create mode 100644
cmd/cat.c
create mode 100644doc/usage/cmd/cat.rstcreate mode 100644test/py/tests/test_cat/conftest.pycreate mode 100644test/py/tests/test_cat/test_cat.pyMAINTAINERS +0
-0@@ -765,6 +765,11 @@ M: Simon Glass [email protected]S: Maintained
F:tools/buildman/MAINTAINERS +5
-0+CAT +M: Roger Knecht [email protected] +S: Maintained +F: cmd/cat.c +CFI FLASH
M: Stefan Roese [email protected]
S: Maintainedcmd/Kconfig +0
-0@@ -1531,6 +1531,12 @@ endmenumenu "Shell scripting commands"
cmd/Kconfig +6
-0+config CMD_CAT + bool "cat" + default n + help + Print file to standard output +config
CMD_ECHO
bool "echo"
default ycmd/Makefile +0
-0@@ -38,6 +38,7 @@ obj-$(CONFIG_CMD_BOOTZ) += bootz.oobj-$(CONFIG_CMD_BOOTI) += booti.o
obj-$(CONFIG_CMD_BTRFS) += btrfs.o
obj-$(CONFIG_CMD_BUTTON) += button.o
+obj-$(CONFIG_CMD_CAT) += cat.o
obj-$(CONFIG_CMD_CACHE) += cache.o
obj-$(CONFIG_CMD_CBFS) += cbfs.o
obj-$(CONFIG_CMD_CLK) += clk.ocmd/cat.c new file +88
-0@@ -0,0 +1,88 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright 2022 +* Roger Knecht [email protected] +*/ + +#include <common.h> +#include <command.h> +#include <fs.h> +#include <malloc.h> +#include <mapmem.h> + +static int do_cat (struct cmd_tbl *cmdtp,int flag,int argc, +char *const argv[]) +{ +char *ifname; +char *dev; +char *file; +char *buffer; +phys_addr_t buffer_sysmem_addr; +loff_t file_size; + +if (argc <4 ) +return CMD_RET_USAGE ; + + ifname = argv[1 ]; + dev = argv[2 ]; + file = argv[3 ]; + +// check file exists +if (fs_set_blk_dev (ifname, dev,FS_TYPE_ANY )) +return CMD_RET_FAILURE ; + +if (!fs_exists (file)) { +log_err ("File does not exist: ifname=%s dev=%s file=%s\n" , ifname, dev, file); +return CMD_RET_FAILURE ; + } + +// get file size +if (fs_set_blk_dev (ifname, dev,FS_TYPE_ANY )) +return CMD_RET_FAILURE ; + +if (fs_size (file, &file_size)) { +log_err ("Cannot read file size: ifname=%s dev=%s file=%s\n" , ifname, dev, file); +return CMD_RET_FAILURE ; + } + +// allocate memory for file content + buffer =calloc (sizeof (char ), file_size +1 ); +if (!buffer) { +log_err ("Out of memory\n" ); +return CMD_RET_FAILURE ; + } + +// map pointer to system memory + buffer_sysmem_addr =map_to_sysmem (buffer); + +// read file to memory +if (fs_set_blk_dev (ifname, dev,FS_TYPE_ANY )) +return CMD_RET_FAILURE ; + +if (fs_read (file, buffer_sysmem_addr,0 ,0 , &file_size)) { +log_err ("Cannot read file: ifname=%s dev=%s file=%s\n" , ifname, dev, file); +return CMD_RET_FAILURE ; + } + +// unmap system memory +unmap_sysmem (buffer); + +// print file content + buffer[file_size] ='\0' ; +puts (buffer); + +free (buffer); + +return 0 ; +} + +#ifdef CONFIG_SYS_LONGHELP +static char cat_help_text[] = +"<interface> <dev[:part]> <file>\n" +" - Print file from 'dev' on 'interface' to standard output\n" ; +#endif + +U_BOOT_CMD (cat,4 ,1 , do_cat, +"Print file to standard output" , + cat_help_text +);configs/sandbox64_defconfig +0
-0@@ -22,6 +22,7 @@ CONFIG_CONSOLE_RECORD=y
CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000CONFIG_PRE_CONSOLE_BUFFER=yCONFIG_DISPLAY_BOARDINFO_LATE=y
+CONFIG_CMD_CAT=yCONFIG_CMD_CPU=yCONFIG_CMD_LICENSE=yCONFIG_CMD_BOOTZ=yconfigs/sandbox_defconfig +0
-0@@ -36,6 +36,7 @@ CONFIG_LOG_DEFAULT_LEVEL=6
CONFIG_DISPLAY_BOARDINFO_LATE=yCONFIG_STACKPROTECTOR=yCONFIG_ANDROID_AB=y
+CONFIG_CMD_CAT=yCONFIG_CMD_CPU=yCONFIG_CMD_LICENSE=yCONFIG_CMD_BOOTM_PRE_LOAD=ydoc/usage/cmd/cat.rst new file +49
-0@@ -0,0 +1,49 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +cat command +=============== + +Synopsis +-------- + +:: + + cat <interface> <dev[:part]> <file> + +Description +----------- + +The cat command prints the file content to standard out. + +interface + interface for accessing the block device (mmc, sata, scsi, usb, ....) + +dev + device number + +part + partition number, defaults to 1 + +file + path to file + +Example +------- + +Here is the output for a example text file: + +:: + + => cat mmc 0:1 hello + hello world + => + +Configuration +------------- + +The cat command is only available if CONFIG_CMD_CAT=y. + +Return value +------------ + +The return value $? is set to 0 (true) if the file is readable, otherwise it returns a non-zero error code.test/py/tests/test_cat/conftest.py new file +21
-0@@ -0,0 +1,33 @@ +# SPDX-License-Identifier: GPL-2.0+ + +"""Fixture for cat command test +""" + +import os +import shutil +from subprocess import check_call +import pytest + [email protected](scope='session') +def cat_data(u_boot_config): + """Set up a file system to be used in cat tests + + Args: + u_boot_config -- U-boot configuration. + + Return: + A path to disk image to be used for testing + """ + mnt_point = u_boot_config.persistent_data_dir + '/test_cat'test/py/tests/test_cat/conftest.py line 31
Quoted 10 lines
test/py/tests/test_cat/conftest.py new file +10
-0+ image_path = u_boot_config.persistent_data_dir + '/cat.img' + + shutil.rmtree(mnt_point, ignore_errors=True) + os.mkdir(mnt_point, mode = 0o755) + + with open(mnt_point + '/hello', 'w', encoding = 'ascii') as file: + file.write('hello world\n') + + check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}', + shell=True)Best practice is to remove test data after usage. You could follow this pattern:
@pytest.fixture()
defresource():print("setup")
yield "resource"print("teardown")
Quoted 6 lines
See
https://docs.pytest.org/en/latest/how-to/fixtures.html#teardown-cleanup-aka-fixture-finalizationvirt-make-fs fails if the user has no read access to the kernel. So you should handle CalledProcessError like in
test/py/tests/test_fs/conftest.py
Will be fixed in the next patch.
Quoted 25 lines
Quoted 25 lines
test/py/tests/test_cat/conftest.py new file +2
-0+ + return image_pathtest/py/tests/test_cat/test_cat.py new file +17
-0@@ -0,0 +1,22 @@ +# SPDX-License-Identifier: GPL-2.0+ + +""" Unit test for cat command +""" + +import pytest + [email protected]('sandbox') [email protected]('cmd_cat') +def test_cat(u_boot_console, cat_data): + """ Unit test for cat + + Args: + u_boot_console -- U-Boot console + cat_data -- Path to the disk image used for testing. + """ + u_boot_console.run_command(cmd = f'host bind 0 {cat_data}')
Quoted 8 lines
test/py/tests/test_cat/test_cat.py line 22
Quoted 5 lines
test/py/tests/test_cat/test_cat.py new file +5
-0+ + response = u_boot_console.run_command(cmd = 'cat host 0 hello') + assert 'hello world' == response + + u_boot_console.run_command(cmd = 'exit', wait_for_echo=False)As Simon already indicated this line should be removed.
Will fix
Quoted 7 lines
Best regards
Heinrich
Quoted 2 lines
--
2.25.1
Thanks for the reviews.
I will send patch v5 soon.
Regards,
Roger