jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests: Setup wlantest once for qosmap tests

Browse source 
Some tests call the check_qos_map() function more than once. Make sure
each test sets up wlantest only once before the first time the function
is called.

The wlantest setup sets the channel for the wlantest interface and
executes the wlantest executable. It is more efficient to do that only
once for each test.

Signed-off-by: Jonathan Afek <jonathanx.afek@intel.com>
This commit is contained in:
Jonathan Afek 2016-07-13 20:06:05 +03:00 committed by Jouni Malinen
parent c7ca843d05
commit 44a4c52c86
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_ap_qosmap.py
View file

@ -18,7 +18,6 @@ def check_qos_map(ap, hapd, dev, sta, dscp, tid, ap_tid=None):
if not ap_tid: if not ap_tid:
ap_tid = tid ap_tid = tid
bssid = ap['bssid'] bssid = ap['bssid']
Wlantest.setup(hapd)
wt = Wlantest() wt = Wlantest()
wt.clear_sta_counters(bssid, sta) wt.clear_sta_counters(bssid, sta)
hwsim_utils.test_connectivity(dev, hapd, dscp=dscp, config=False) hwsim_utils.test_connectivity(dev, hapd, dscp=dscp, config=False)
@ -50,6 +49,7 @@ def test_ap_qosmap(dev, apdev):
addr = dev[0].p2p_interface_addr() addr = dev[0].p2p_interface_addr()
dev[0].request("DATA_TEST_CONFIG 1") dev[0].request("DATA_TEST_CONFIG 1")
hapd.request("DATA_TEST_CONFIG 1") hapd.request("DATA_TEST_CONFIG 1")
Wlantest.setup(hapd)
check_qos_map(apdev[0], hapd, dev[0], addr, 53, 2) check_qos_map(apdev[0], hapd, dev[0], addr, 53, 2)
check_qos_map(apdev[0], hapd, dev[0], addr, 22, 6) check_qos_map(apdev[0], hapd, dev[0], addr, 22, 6)
check_qos_map(apdev[0], hapd, dev[0], addr, 8, 0) check_qos_map(apdev[0], hapd, dev[0], addr, 8, 0)
@ -85,6 +85,7 @@ def test_ap_qosmap_default(dev, apdev):
addr = dev[0].p2p_interface_addr() addr = dev[0].p2p_interface_addr()
dev[0].request("DATA_TEST_CONFIG 1") dev[0].request("DATA_TEST_CONFIG 1")
hapd.request("DATA_TEST_CONFIG 1") hapd.request("DATA_TEST_CONFIG 1")
Wlantest.setup(hapd)
for dscp in [ 0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]: for dscp in [ 0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]:
check_qos_map(apdev[0], hapd, dev[0], addr, dscp, dscp >> 3) check_qos_map(apdev[0], hapd, dev[0], addr, dscp, dscp >> 3)
dev[0].request("DATA_TEST_CONFIG 0") dev[0].request("DATA_TEST_CONFIG 0")
@ -120,6 +121,7 @@ def test_ap_qosmap_default_acm(dev, apdev):
addr = dev[0].p2p_interface_addr() addr = dev[0].p2p_interface_addr()
dev[0].request("DATA_TEST_CONFIG 1") dev[0].request("DATA_TEST_CONFIG 1")
hapd.request("DATA_TEST_CONFIG 1") hapd.request("DATA_TEST_CONFIG 1")
Wlantest.setup(hapd)
for dscp in [ 0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]: for dscp in [ 0, 7, 8, 15, 16, 23, 24, 31, 32, 39, 40, 47, 48, 55, 56, 63]:
ap_tid = dscp >> 3 ap_tid = dscp >> 3
tid = ap_tid tid = ap_tid