mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-16 01:44:34 +00:00
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 <trini@konsulko.com>
This commit is contained in:
parent
e24053d8fb
commit
9850689751
2 changed files with 3 additions and 7 deletions
|
@ -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
|
||||
|
||||
@pytest.mark.buildconfigspec('cmd_net')
|
||||
@pytest.mark.buildconfigspec('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
|
||||
|
||||
@pytest.mark.buildconfigspec("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")
|
||||
@pytest.mark.buildconfigspec("cmd_net")
|
||||
@pytest.mark.buildconfigspec("cmd_tftpboot")
|
||||
@pytest.mark.buildconfigspec("cmd_tftpput")
|
||||
def test_net_tftpput(u_boot_console):
|
||||
"""Test the tftpput command.
|
||||
|
|
|
@ -156,7 +156,7 @@ def setup_tftpboot_boot(u_boot_console):
|
|||
|
||||
return addr, timeout, pattern, chk_type, chk_pattern, config
|
||||
|
||||
@pytest.mark.buildconfigspec('cmd_net')
|
||||
@pytest.mark.buildconfigspec('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
|
||||
|
||||
@pytest.mark.buildconfigspec('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()
|
||||
|
||||
@pytest.mark.buildconfigspec('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()
|
||||
|
||||
@pytest.mark.buildconfigspec('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
|
||||
|
|
Loading…
Add table
Reference in a new issue