From: Jonathan Afek Date: Wed, 13 Jul 2016 17:06:05 +0000 (+0300) Subject: tests: Setup wlantest once for qosmap tests X-Git-Tag: hostap_2_6~53 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=mech_eap.git;a=commitdiff_plain;h=44a4c52c86bed6ee69b132b1edbd4a619c1efe0e;ds=sidebyside tests: Setup wlantest once for qosmap tests 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 --- diff --git a/tests/hwsim/test_ap_qosmap.py b/tests/hwsim/test_ap_qosmap.py index ffe8ca0..3119a98 100644 --- a/tests/hwsim/test_ap_qosmap.py +++ b/tests/hwsim/test_ap_qosmap.py @@ -18,7 +18,6 @@ def check_qos_map(ap, hapd, dev, sta, dscp, tid, ap_tid=None): if not ap_tid: ap_tid = tid bssid = ap['bssid'] - Wlantest.setup(hapd) wt = Wlantest() wt.clear_sta_counters(bssid, sta) 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() dev[0].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, 22, 6) 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() dev[0].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]: check_qos_map(apdev[0], hapd, dev[0], addr, dscp, dscp >> 3) 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() dev[0].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]: ap_tid = dscp >> 3 tid = ap_tid