test/py/tests: Update some network dependencies
PATCH 1/1 test/py/tests: Update some network dependencies
On tests which require "tftpboot" we need to depend not on cmd_net but rather cmd_tftpboot. And on tests which require cmd_pxe we do not need to also depend on cmd_net as this should be handled already via Kconfig logic.
Signed-off-by Tom Rini <[email protected]>
--- test/py/tests/test_net.py | 5 ++--- test/py/tests/test_net_boot.py | 5 +---- 2 files changed, 3 insertions(+), 7 deletions(-)
test/py/tests/test_net.py +2 -3
@@ -254,7 +254,7 @@ def test_net_network_discovery(u_boot_console): assert 'Set gatewayip6:' in output assert '0000:0000:0000:0000:0000:0000:0000:0000' not in output [email protected]('cmd_net') [email protected]('cmd_tftpboot') def test_net_tftpboot(u_boot_console): """Test the tftpboot command.
@@ -335,7 +335,6 @@ def test_net_nfs(u_boot_console): output = u_boot_console.run_command('crc32 %x $filesize' % addr) assert expected_crc in output [email protected]("cmd_net") @pytest.mark.buildconfigspec("cmd_pxe") def test_net_pxe_get(u_boot_console): """Test the pxe get command.
@@ -391,7 +390,7 @@ def test_net_pxe_get(u_boot_console): assert "Config file 'default.boot' found" in output @pytest.mark.buildconfigspec("cmd_crc32") [email protected]("cmd_net") [email protected]("cmd_tftpboot") @pytest.mark.buildconfigspec("cmd_tftpput") def test_net_tftpput(u_boot_console): """Test the tftpput command.
test/py/tests/test_net_boot.py +1 -4
@@ -156,7 +156,7 @@ def setup_tftpboot_boot(u_boot_console): return addr, timeout, pattern, chk_type, chk_pattern, config [email protected]('cmd_net') [email protected]('cmd_tftpboot') def test_net_tftpboot_boot(u_boot_console): """Boot the loaded image
@@ -209,7 +209,6 @@ def setup_pxe_boot(u_boot_console): return f, bootfile [email protected]('cmd_net') @pytest.mark.buildconfigspec('cmd_pxe') def test_net_pxe_boot(u_boot_console): """Test the pxe boot command.
@@ -261,7 +260,6 @@ def test_net_pxe_boot(u_boot_console): u_boot_console.drain_console() u_boot_console.cleanup_spawn() [email protected]('cmd_net') @pytest.mark.buildconfigspec('cmd_pxe') def test_net_pxe_boot_config(u_boot_console): """Test the pxe boot command by selecting different combination of labels
@@ -341,7 +339,6 @@ def test_net_pxe_boot_config(u_boot_console): u_boot_console.drain_console() u_boot_console.cleanup_spawn() [email protected]('cmd_net') @pytest.mark.buildconfigspec('cmd_pxe') def test_net_pxe_boot_config_invalid(u_boot_console): """Test the pxe boot command by selecting invalid label
Signature · 1 line
2.34.1
Quoted 6 lines · Tom Rini
On tests which require "tftpboot" we need to depend not on
cmd_netbut rathercmd_tftpboot. And on tests which requirecmd_pxewe do not need to also depend oncmd_netas this should be handled already viaKconfiglogic.
Applied to u-boot/master, thanks!
Signature · 1 line
Tom