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>

diff --git a/test/py/tests/test_net.py b/test/py/tests/test_net.py
index 038a473b239471ea4dc398803cbebc303dda21ae..ad143c19b0d2607e099f657a1ca03d57f352da88 100644 (file)
--- a/test/py/tests/test_net.py
+++ b/test/py/tests/test_net.py
@@ -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.

diff --git a/test/py/tests/test_net_boot.py b/test/py/tests/test_net_boot.py
index 4729ccf07feb903f4e235d9df51b9d29058f5c43..63309fe82e126ec2a2cf3ce4c59aec946b1ae06d 100644 (file)
--- a/test/py/tests/test_net_boot.py
+++ b/test/py/tests/test_net_boot.py
@@ -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