Browse Source

tests: Drop mesh_ht_mode parameter from mesh test cases

This network profile parameter will be removed with the cleanup that
makes mesh use shared functions for setting channel parameters. That
will allow HT to be enabled automatically based on driver capabilities.

Signed-off-by: Jouni Malinen <j@w1.fi>
Jouni Malinen 10 years ago
parent
commit
70437ae55a
1 changed files with 8 additions and 11 deletions
  1. 8 11
      tests/hwsim/test_wpas_mesh.py

+ 8 - 11
tests/hwsim/test_wpas_mesh.py

@@ -100,15 +100,12 @@ def test_wpas_add_set_remove_support(dev):
     dev[0].set_network(id, "mode", "5")
     dev[0].remove_network(id)
 
-def add_open_mesh_network(dev, ht_mode=False, freq="2412", start=True,
-                          beacon_int=0):
+def add_open_mesh_network(dev, freq="2412", start=True, beacon_int=0):
     id = dev.add_network()
     dev.set_network(id, "mode", "5")
     dev.set_network_quoted(id, "ssid", "wpas-mesh-open")
     dev.set_network(id, "key_mgmt", "NONE")
     dev.set_network(id, "frequency", freq)
-    if ht_mode:
-        dev.set_network(id, "mesh_ht_mode", ht_mode)
     if beacon_int:
         dev.set_network(id, "beacon_int", str(beacon_int))
     if start:
@@ -127,7 +124,7 @@ def test_wpas_mesh_group_added(dev):
 def test_wpas_mesh_group_remove(dev):
     """wpa_supplicant MESH group remove"""
     check_mesh_support(dev[0])
-    add_open_mesh_network(dev[0], ht_mode="NOHT")
+    add_open_mesh_network(dev[0])
     # Check for MESH-GROUP-STARTED event
     check_mesh_group_added(dev[0])
     dev[0].mesh_group_remove()
@@ -138,8 +135,8 @@ def test_wpas_mesh_group_remove(dev):
 def test_wpas_mesh_peer_connected(dev):
     """wpa_supplicant MESH peer connected"""
     check_mesh_support(dev[0])
-    add_open_mesh_network(dev[0], ht_mode="HT20", beacon_int=160)
-    add_open_mesh_network(dev[1], ht_mode="HT20", beacon_int=160)
+    add_open_mesh_network(dev[0], beacon_int=160)
+    add_open_mesh_network(dev[1], beacon_int=160)
 
     # Check for mesh joined
     check_mesh_group_added(dev[0])
@@ -173,8 +170,8 @@ def test_wpas_mesh_peer_disconnected(dev):
 def test_wpas_mesh_mode_scan(dev):
     """wpa_supplicant MESH scan support"""
     check_mesh_support(dev[0])
-    add_open_mesh_network(dev[0], ht_mode="HT40+")
-    add_open_mesh_network(dev[1], ht_mode="HT40+", beacon_int=175)
+    add_open_mesh_network(dev[0])
+    add_open_mesh_network(dev[1], beacon_int=175)
 
     # Check for mesh joined
     check_mesh_group_added(dev[0])
@@ -186,8 +183,8 @@ def test_wpas_mesh_mode_scan(dev):
 def test_wpas_mesh_open(dev, apdev):
     """wpa_supplicant open MESH network connectivity"""
     check_mesh_support(dev[0])
-    add_open_mesh_network(dev[0], ht_mode="HT40-", freq="2462")
-    add_open_mesh_network(dev[1], ht_mode="HT40-", freq="2462")
+    add_open_mesh_network(dev[0], freq="2462")
+    add_open_mesh_network(dev[1], freq="2462")
 
     # Check for mesh joined
     check_mesh_group_added(dev[0])