Revert "test/py: net: Add dhcp abort test"

In practice, as this test defaults to enabled rather than disabled, too
many platforms now fail.

This reverts commit d8364738623ff47dd2321dd68da310abb58fe861.

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 cc2e53c6981d6e37d2c904d515c8393be7be1ac4..4ff3dafd6293e11b91caa15dc047eae3f4e8a074 100644 (file)
--- a/test/py/tests/test_net.py
+++ b/test/py/tests/test_net.py
@@ -8,7 +8,6 @@ import pytest
 import u_boot_utils
 import uuid
 import datetime
-import re
 
 """
 Note: This test relies on boardenv_* containing configuration values to define
@@ -32,11 +31,6 @@ env__net_uses_pci = True
 # set to False.
 env__net_dhcp_server = True
 
-# False or omitted if a DHCP server is attached to the network, and dhcp abort
-# case should be tested.
-# If DHCP abort testing is not possible or desired, set this variable to True.
-env__dhcp_abort_test_skip = True
-
 # True if a DHCPv6 server is attached to the network, and should be tested.
 # If DHCPv6 testing is not possible or desired, this variable may be omitted or
 # set to False.
@@ -126,57 +120,6 @@ def test_net_dhcp(u_boot_console):
     global net_set_up
     net_set_up = True
 
-@pytest.mark.buildconfigspec("cmd_dhcp")
-@pytest.mark.buildconfigspec("cmd_mii")
-def test_net_dhcp_abort(u_boot_console):
-    """Test the dhcp command by pressing ctrl+c in the middle of dhcp request
-
-    The boardenv_* file may be used to enable/disable this test; see the
-    comment at the beginning of this file.
-    """
-
-    test_dhcp = u_boot_console.config.env.get("env__net_dhcp_server", False)
-    if not test_dhcp:
-        pytest.skip("No DHCP server available")
-
-    if u_boot_console.config.env.get("env__dhcp_abort_test_skip", False):
-        pytest.skip("DHCP abort test is not enabled!")
-
-    u_boot_console.run_command("setenv autoload no")
-
-    # Phy reset before running dhcp command
-    output = u_boot_console.run_command("mii device")
-    if not re.search(r"Current device: '(.+?)'", output):
-        pytest.skip("PHY device does not exist!")
-    eth_num = re.search(r"Current device: '(.+?)'", output).groups()[0]
-    u_boot_console.run_command(f"mii device {eth_num}")
-    output = u_boot_console.run_command("mii info")
-    eth_addr = hex(int(re.search(r"PHY (.+?):", output).groups()[0], 16))
-    u_boot_console.run_command(f"mii modify {eth_addr} 0 0x8000 0x8000")
-
-    u_boot_console.run_command("dhcp", wait_for_prompt=False)
-    try:
-        u_boot_console.wait_for("Waiting for PHY auto negotiation to complete")
-    except:
-        pytest.skip("Timeout waiting for PHY auto negotiation to complete")
-
-    u_boot_console.wait_for("done")
-
-    # Sending Ctrl-C
-    output = u_boot_console.run_command(
-        chr(3), wait_for_echo=False, send_nl=False
-    )
-
-    assert "TIMEOUT" not in output
-    assert "DHCP client bound to address " not in output
-    assert "Abort" in output
-
-    # Provide a time to recover from Abort - if it is not performed
-    # There is message like: ethernet@ff0e0000: No link.
-    u_boot_console.run_command("sleep 1")
-    # Run the dhcp test to setup the network configuration
-    test_net_dhcp(u_boot_console)
-
 @pytest.mark.buildconfigspec('cmd_dhcp6')
 def test_net_dhcp6(u_boot_console):
     """Test the dhcp6 command.