DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: Pass full apdev to clear_scan_cache()

Browse source 
This is a step towards enabling the needed commands to be run on a
remote host.

Signed-off-by: Jonathan Afek <jonathanx.afek@intel.com>
This commit is contained in:
Jonathan Afek 2016-06-07 16:42:41 +03:00 • committed by Jouni Malinen
parent f8b9e61ef0
commit cb3c0d96f4
4 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/hwsim/test_ap_acs.py
View file

@ -106,7 +106,7 @@ def test_ap_multi_bss_acs(dev, apdev):
def test_ap_acs_40mhz(dev, apdev): def test_ap_acs_40mhz(dev, apdev):
"""Automatic channel selection for 40 MHz channel""" """Automatic channel selection for 40 MHz channel"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
force_prev_ap_on_24g(apdev[0]) force_prev_ap_on_24g(apdev[0])
params = hostapd.wpa2_params(ssid="test-acs", passphrase="12345678") params = hostapd.wpa2_params(ssid="test-acs", passphrase="12345678")
params['channel'] = '0' params['channel'] = '0'

39
tests/hwsim/test_ap_ht.py
View file

@ -15,7 +15,8 @@ from utils import HwsimSkip, alloc_fail
import hwsim_utils import hwsim_utils
from test_ap_csa import csa_supported from test_ap_csa import csa_supported
def clear_scan_cache(ifname): def clear_scan_cache(apdev):
ifname = apdev['ifname']
subprocess.call(['ifconfig', ifname, 'up']) subprocess.call(['ifconfig', ifname, 'up'])
subprocess.call(['iw', ifname, 'scan', 'trigger', 'freq', '2412', 'flush']) subprocess.call(['iw', ifname, 'scan', 'trigger', 'freq', '2412', 'flush'])
time.sleep(0.1) time.sleep(0.1)
@ -23,7 +24,7 @@ def clear_scan_cache(ifname):
def test_ap_ht40_scan(dev, apdev): def test_ap_ht40_scan(dev, apdev):
"""HT40 co-ex scan""" """HT40 co-ex scan"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "test-ht40", params = { "ssid": "test-ht40",
"channel": "5", "channel": "5",
"ht_capab": "[HT40-]"} "ht_capab": "[HT40-]"}
@ -58,7 +59,7 @@ def test_ap_ht40_scan(dev, apdev):
def test_ap_ht40_scan_conflict(dev, apdev): def test_ap_ht40_scan_conflict(dev, apdev):
"""HT40 co-ex scan conflict""" """HT40 co-ex scan conflict"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "test-ht40", params = { "ssid": "test-ht40",
"channel": "6", "channel": "6",
"ht_capab": "[HT40+]"} "ht_capab": "[HT40+]"}
@ -98,7 +99,7 @@ def test_ap_ht40_scan_conflict(dev, apdev):
def test_ap_ht40_scan_conflict2(dev, apdev): def test_ap_ht40_scan_conflict2(dev, apdev):
"""HT40 co-ex scan conflict (HT40-)""" """HT40 co-ex scan conflict (HT40-)"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "test-ht40", params = { "ssid": "test-ht40",
"channel": "11", "channel": "11",
"ht_capab": "[HT40-]"} "ht_capab": "[HT40-]"}
@ -138,7 +139,7 @@ def test_ap_ht40_scan_conflict2(dev, apdev):
def test_ap_ht40_scan_not_affected(dev, apdev): def test_ap_ht40_scan_not_affected(dev, apdev):
"""HT40 co-ex scan and other BSS not affected""" """HT40 co-ex scan and other BSS not affected"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "test-ht20", params = { "ssid": "test-ht20",
"channel": "11" } "channel": "11" }
hostapd.add_ap(apdev[1], params) hostapd.add_ap(apdev[1], params)
@ -185,7 +186,7 @@ def test_ap_ht40_scan_not_affected(dev, apdev):
def test_ap_ht40_scan_legacy_conflict(dev, apdev): def test_ap_ht40_scan_legacy_conflict(dev, apdev):
"""HT40 co-ex scan conflict with legacy 20 MHz AP""" """HT40 co-ex scan conflict with legacy 20 MHz AP"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "legacy-20", params = { "ssid": "legacy-20",
"channel": "7", "ieee80211n": "0" } "channel": "7", "ieee80211n": "0" }
hostapd.add_ap(apdev[1], params) hostapd.add_ap(apdev[1], params)
@ -224,7 +225,7 @@ def test_ap_ht40_scan_legacy_conflict(dev, apdev):
def test_ap_ht40_scan_ht20_conflict(dev, apdev): def test_ap_ht40_scan_ht20_conflict(dev, apdev):
"""HT40 co-ex scan conflict with HT 20 MHz AP""" """HT40 co-ex scan conflict with HT 20 MHz AP"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "ht-20", params = { "ssid": "ht-20",
"channel": "7", "ieee80211n": "1" } "channel": "7", "ieee80211n": "1" }
hostapd.add_ap(apdev[1], params) hostapd.add_ap(apdev[1], params)
@ -263,7 +264,7 @@ def test_ap_ht40_scan_ht20_conflict(dev, apdev):
def test_ap_ht40_scan_intolerant(dev, apdev): def test_ap_ht40_scan_intolerant(dev, apdev):
"""HT40 co-ex scan finding an AP advertising 40 MHz intolerant""" """HT40 co-ex scan finding an AP advertising 40 MHz intolerant"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "another-bss", params = { "ssid": "another-bss",
"channel": "1", "channel": "1",
"ht_capab": "[40-INTOLERANT]" } "ht_capab": "[40-INTOLERANT]" }
@ -303,7 +304,7 @@ def test_ap_ht40_scan_intolerant(dev, apdev):
def test_ap_ht40_scan_match(dev, apdev): def test_ap_ht40_scan_match(dev, apdev):
"""HT40 co-ex scan matching configuration""" """HT40 co-ex scan matching configuration"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "test-ht40", params = { "ssid": "test-ht40",
"channel": "5", "channel": "5",
"ht_capab": "[HT40-]"} "ht_capab": "[HT40-]"}
@ -343,7 +344,7 @@ def test_ap_ht40_scan_match(dev, apdev):
def test_ap_ht40_5ghz_match(dev, apdev): def test_ap_ht40_5ghz_match(dev, apdev):
"""HT40 co-ex scan on 5 GHz with matching pri/sec channel""" """HT40 co-ex scan on 5 GHz with matching pri/sec channel"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
try: try:
hapd = None hapd = None
hapd2 = None hapd2 = None
@ -397,7 +398,7 @@ def test_ap_ht40_5ghz_match(dev, apdev):
def test_ap_ht40_5ghz_switch(dev, apdev): def test_ap_ht40_5ghz_switch(dev, apdev):
"""HT40 co-ex scan on 5 GHz switching pri/sec channel""" """HT40 co-ex scan on 5 GHz switching pri/sec channel"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
try: try:
hapd = None hapd = None
hapd2 = None hapd2 = None
@ -450,7 +451,7 @@ def test_ap_ht40_5ghz_switch(dev, apdev):
def test_ap_ht40_5ghz_switch2(dev, apdev): def test_ap_ht40_5ghz_switch2(dev, apdev):
"""HT40 co-ex scan on 5 GHz switching pri/sec channel (2)""" """HT40 co-ex scan on 5 GHz switching pri/sec channel (2)"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
try: try:
hapd = None hapd = None
hapd2 = None hapd2 = None
@ -601,7 +602,7 @@ def test_obss_scan_40_intolerant(dev, apdev):
def test_obss_coex_report_handling(dev, apdev): def test_obss_coex_report_handling(dev, apdev):
"""Overlapping BSS scan report handling with obss_interval=0""" """Overlapping BSS scan report handling with obss_interval=0"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "obss-scan", params = { "ssid": "obss-scan",
"channel": "6", "channel": "6",
"ht_capab": "[HT40-]" } "ht_capab": "[HT40-]" }
@ -630,7 +631,7 @@ def test_obss_coex_report_handling(dev, apdev):
def test_obss_coex_report_handling1(dev, apdev): def test_obss_coex_report_handling1(dev, apdev):
"""Overlapping BSS scan report handling with obss_interval=1""" """Overlapping BSS scan report handling with obss_interval=1"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "obss-scan", params = { "ssid": "obss-scan",
"channel": "6", "channel": "6",
"ht_capab": "[HT40+]", "ht_capab": "[HT40+]",
@ -806,7 +807,7 @@ def test_ap_ht_capab_not_supported(dev, apdev):
def test_ap_ht_40mhz_intolerant_sta(dev, apdev): def test_ap_ht_40mhz_intolerant_sta(dev, apdev):
"""Associated STA indicating 40 MHz intolerant""" """Associated STA indicating 40 MHz intolerant"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "intolerant", params = { "ssid": "intolerant",
"channel": "6", "channel": "6",
"ht_capab": "[HT40-]" } "ht_capab": "[HT40-]" }
@ -839,7 +840,7 @@ def test_ap_ht_40mhz_intolerant_sta(dev, apdev):
def test_ap_ht_40mhz_intolerant_ap(dev, apdev): def test_ap_ht_40mhz_intolerant_ap(dev, apdev):
"""Associated STA reports 40 MHz intolerant AP after association""" """Associated STA reports 40 MHz intolerant AP after association"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
params = { "ssid": "ht", params = { "ssid": "ht",
"channel": "6", "channel": "6",
"ht_capab": "[HT40-]", "ht_capab": "[HT40-]",
@ -1114,7 +1115,7 @@ def test_prefer_ht20_during_roam(dev, apdev):
def test_ap_ht40_5ghz_invalid_pair(dev, apdev): def test_ap_ht40_5ghz_invalid_pair(dev, apdev):
"""HT40 on 5 GHz with invalid channel pair""" """HT40 on 5 GHz with invalid channel pair"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
try: try:
params = { "ssid": "test-ht40", params = { "ssid": "test-ht40",
"hw_mode": "a", "hw_mode": "a",
@ -1134,7 +1135,7 @@ def test_ap_ht40_5ghz_invalid_pair(dev, apdev):
def test_ap_ht40_5ghz_disabled_sec(dev, apdev): def test_ap_ht40_5ghz_disabled_sec(dev, apdev):
"""HT40 on 5 GHz with disabled secondary channel""" """HT40 on 5 GHz with disabled secondary channel"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
try: try:
params = { "ssid": "test-ht40", params = { "ssid": "test-ht40",
"hw_mode": "a", "hw_mode": "a",
@ -1154,7 +1155,7 @@ def test_ap_ht40_5ghz_disabled_sec(dev, apdev):
def test_ap_ht40_scan_broken_ap(dev, apdev): def test_ap_ht40_scan_broken_ap(dev, apdev):
"""HT40 co-ex scan and broken legacy/HT AP""" """HT40 co-ex scan and broken legacy/HT AP"""
clear_scan_cache(apdev[0]['ifname']) clear_scan_cache(apdev[0])
# Broken AP: Include HT Capabilities element but not HT Operation element # Broken AP: Include HT Capabilities element but not HT Operation element
params = { "ssid": "legacy-20", params = { "ssid": "legacy-20",

2
tests/hwsim/test_ap_vht.py
View file

@ -63,7 +63,7 @@ def test_ap_vht80(dev, apdev):
dev[0].flush_scan_cache() dev[0].flush_scan_cache()
def vht80_test(apdev, dev, channel, ht_capab): def vht80_test(apdev, dev, channel, ht_capab):
clear_scan_cache(apdev['ifname']) clear_scan_cache(apdev)
try: try:
hapd = None hapd = None
params = { "ssid": "vht", params = { "ssid": "vht",

2
tests/hwsim/test_p2p_concurrency.py
View file

@ -39,7 +39,7 @@ def test_concurrent_autogo(dev, apdev):
def test_concurrent_autogo_5ghz_ht40(dev, apdev): def test_concurrent_autogo_5ghz_ht40(dev, apdev):
"""Concurrent P2P autonomous GO on 5 GHz and HT40 co-ex""" """Concurrent P2P autonomous GO on 5 GHz and HT40 co-ex"""
clear_scan_cache(apdev[1]['ifname']) clear_scan_cache(apdev[1])
try: try:
hapd = None hapd = None
hapd2 = None hapd2 = None