...
 
Commits (4)
......@@ -151,7 +151,7 @@ class SmallUBootStrategy(Strategy):
# we need to press the reset-button for some seconds
# but we need to make sure that it is released when entering uboot
time.sleep(4)
time.sleep(6)
#release reset
reset.set(False)
......
......@@ -262,10 +262,9 @@ def test_new_running_correct_branch(target, in_new_running, fw_good):
("wireless.client_radio0.disabled", "0", True),
("wireless.client_radio0.mode", "ap", True),
("wireless.ibss_radio0.disabled", "0", True),
("wireless.ibss_radio0.bssid", "02:d1:11:37:fc:38", True),
("wireless.ibss_radio0.ssid", "02:d1:11:37:fc:38", True),
("wireless.ibss_radio0.mode", "adhoc", True),
("wireless.mesh_radio0.disabled", "0", True),
("wireless.mesh_radio0.mesh_id", "ffbs-mesh", True),
("wireless.mesh_radio0.mode", "mesh", True),
("wireless.radio0.supported_rates", "'1000'", False),
("wireless.radio0.supported_rates", "'2000'", False),
......@@ -318,26 +317,26 @@ def test_good_wifi_uci_config_fastd(target, in_new_running, config):
assert test_key == uci_key, "UCI Key {} probably not found in output: {}".format(uci_key, stdout)
assert test_value == uci_value, "UCI Key {} does not contain value {} but returned {} instead".format(uci_key, uci_value, stdout)
def test_new_running_disable_ibss0(target, in_new_running):
def test_new_running_disable_mesh0(target, in_new_running):
command = target.get_driver("ShellDriver")
# give BATMAN time to settle
time.sleep(20)
stdout, _, _ = command.run("ip l set ibss0 down")
assert len("".join(stdout)) == 0, "Could not disable ibss0 for testing of wired uplink"
stdout, _, _ = command.run("ip l set mesh0 down")
assert len("".join(stdout)) == 0, "Could not disable mesh0 for testing of wired uplink"
# give BATMAN time to settle
time.sleep(20)
def test_new_running_check_ibss0_down(target, in_new_running):
def test_new_running_check_mesh0_down(target, in_new_running):
command = target.get_driver("ShellDriver")
stdout, _, _ = command.run("ip l | grep ibss0")
stdout, _, _ = command.run("ip l | grep mesh0")
assert "DOWN" in " ".join(stdout), "Failed to get ibss0 DOWN"
assert "DOWN" in " ".join(stdout), "Failed to get mesh0 DOWN"
@pytest.mark.flaky(reruns=10, reruns_delay=30)
@pytest.mark.flaky(reruns=50, reruns_delay=10)
def test_new_running_batctl_wired(target, in_new_running):
command = target.get_driver("ShellDriver")
......@@ -346,7 +345,7 @@ def test_new_running_batctl_wired(target, in_new_running):
assert "No gateways in range" not in " ".join(stdout), "Batman has no gateways in range"
assert "Error - mesh has not been enabled yet" not in " ".join(stdout), "Batman mesh is not enabled yet"
assert "BATMAN mesh bat0 disabled - primary interface not active" not in " ".join(stdout), "Batman hat not selected an interface yet"
assert "=>" in " ".join(stdout), "no selected gw in 'batctl gwl'. command returned: {}".format(stdout)
assert "=>" in " ".join(stdout) or "* " in " ".join(stdout) , "no selected gw in 'batctl gwl'. command returned: {}".format(stdout)
assert "mesh-vpn" in " ".join(stdout), "mesh-vpn was not selected by batman"
@pytest.mark.flaky(reruns=10, reruns_delay=10)
......@@ -385,11 +384,11 @@ def test_new_running_external_host_reachable_wired(target, in_new_running, confi
assert "2 packets received" in " ".join(stdout), "got packetloss to {}. ping returned: {}".format(config["ping_target_external_hostname"], stdout)
def test_new_running_enable_ibss0(target, in_new_running):
def test_new_running_enable_mesh0(target, in_new_running):
command = target.get_driver("ShellDriver")
stdout, _, _ = command.run("ifup ibss_radio0")
stdout, _, _ = command.run("ifup mesh_radio0")
assert len("".join(stdout)) == 0, "Could not enable ibss0 for testing of wireless uplink"
assert len("".join(stdout)) == 0, "Could not enable mesh0 for testing of wireless uplink"
def test_new_running_disable_fastd(target, in_new_running):
command = target.get_driver("ShellDriver")
......@@ -410,7 +409,7 @@ def test_new_running_batctl_wireless(target, in_new_running):
assert "Error - mesh has not been enabled yet" not in " ".join(stdout), "Batman mesh is not enabled yet"
assert "BATMAN mesh bat0 disabled - primary interface not active" not in " ".join(stdout), "Batman hat not selected an interface yet"
assert "=>" in " ".join(stdout), "no selected gw in 'batctl gwl'. command returned: {}".format(stdout)
assert "ibss0" in " ".join(stdout), "ibss0 was not selected by batman"
assert "mesh0" in " ".join(stdout), "mesh0 was not selected by batman"
@pytest.mark.flaky(reruns=5, reruns_delay=10)
def test_new_running_external_host_reachable_wireless(target, in_new_running, config):
......