From: Jouni Malinen Date: Sat, 24 Dec 2016 22:47:01 +0000 (+0200) Subject: tests: Fix mesh_open_vht_160 skipping X-Git-Tag: hostap_2_7~1957 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=963041c3cbb3d1b64b90ec47665ba3ce44797672;p=thirdparty%2Fhostap.git tests: Fix mesh_open_vht_160 skipping It is possible for wireless-regdb to include a 160 MHz channel, but with DFS required. This test case need the regulatory information to allow 160 MHz channel without DFS. Fix false failures by skipping the test if this exact combination is not found. Signed-off-by: Jouni Malinen --- diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py index 0bf5b51aa..6ea79fceb 100644 --- a/tests/hwsim/test_wpas_mesh.py +++ b/tests/hwsim/test_wpas_mesh.py @@ -890,8 +890,13 @@ def _test_mesh_open_vht_160(dev, apdev): cmd = subprocess.Popen(["iw", "reg", "get"], stdout=subprocess.PIPE) reg = cmd.stdout.read() - if "@ 160)" not in reg: - raise HwsimSkip("160 MHz channel not supported in regulatory information") + found = False + for entry in reg.splitlines(): + if "@ 160)" in entry and "DFS" not in entry: + found = True + break + if not found: + raise HwsimSkip("160 MHz channel without DFS not supported in regulatory information") add_open_mesh_network(dev[i], freq="5520", chwidth=2)