tests: Mesh HT mode

Change the mesh tests to check for the presence of HT in the scan
results.

[original implementation by Chun-Yeow Yeoh <yeohchunyeow@gmail.com>]
[some fixes by Masashi Honma <masashi.honma@gmail.com>]
Signed-off-by: Ashok Nagarajan <ashok.dragon@gmail.com>
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: Jason Mobarak <x@jason.mobarak.name>

diff --git a/tests/hwsim/test_wpas_mesh.py b/tests/hwsim/test_wpas_mesh.py
index fec1634be3d29666a69e33d8594bf041a2f23f1a..c5eea721059e79e9b944ddaecad94fb62462424b 100644 (file)
--- a/tests/hwsim/test_wpas_mesh.py
+++ b/tests/hwsim/test_wpas_mesh.py
@@ -43,7 +43,7 @@ def check_mesh_scan(dev, params, other_started=False):
 
     res = dev.request("SCAN_RESULTS")
 
-    if not res.find("[MESH]"):
+    if res.find("[MESH]") < 0:
         raise Exception("Scan did not contain a MESH network")
 
 
@@ -168,6 +168,7 @@ def test_wpas_mesh_mode_scan(dev):
     dev[0].set_network_quoted(id, "ssid", "wpas-mesh-open")
     dev[0].set_network(id, "key_mgmt", "NONE")
     dev[0].set_network(id, "frequency", "2412")
+    dev[0].set_network(id, "mesh_ht_mode", "HT40+")
     dev[0].mesh_group_add(id)
 
     id = dev[1].add_network()
@@ -175,6 +176,7 @@ def test_wpas_mesh_mode_scan(dev):
     dev[1].set_network_quoted(id, "ssid", "wpas-mesh-open")
     dev[1].set_network(id, "key_mgmt", "NONE")
     dev[1].set_network(id, "frequency", "2412")
+    dev[1].set_network(id, "mesh_ht_mode", "HT40+")
     dev[1].mesh_group_add(id)
 
     # Check for mesh joined
@@ -201,6 +203,7 @@ def _test_wpas_mesh_open(dev, apdev, test_connectivity):
     dev[0].set_network_quoted(id, "ssid", "wpas-mesh-open")
     dev[0].set_network(id, "key_mgmt", "NONE")
     dev[0].set_network(id, "frequency", "2412")
+    dev[0].set_network(id, "mesh_ht_mode", "HT40+")
     dev[0].mesh_group_add(id)
 
     id = dev[1].add_network()
@@ -208,6 +211,7 @@ def _test_wpas_mesh_open(dev, apdev, test_connectivity):
     dev[1].set_network_quoted(id, "ssid", "wpas-mesh-open")
     dev[1].set_network(id, "key_mgmt", "NONE")
     dev[1].set_network(id, "frequency", "2412")
+    dev[1].set_network(id, "mesh_ht_mode", "HT40+")
     dev[1].mesh_group_add(id)
 
     # Check for mesh joined