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

tests: Fix wpas_ctrl_oom

Browse source 
The OpenSSL memory allocation changes broke this test case. Fix this by
removing the cases that do not get triggered anymore and add a separate
wpas_ctrl_error test case to cover the fail_test() versions of errors.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-01-15 16:27:13 +02:00 committed by Jouni Malinen
parent ac2053b103
commit eaef5861d7
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
tests/hwsim/test_wpas_ctrl.py
View file

@ -15,7 +15,7 @@ import hostapd
import hwsim_utils import hwsim_utils
from hwsim import HWSimRadio from hwsim import HWSimRadio
from wpasupplicant import WpaSupplicant from wpasupplicant import WpaSupplicant
from utils import alloc_fail from utils import alloc_fail, fail_test
from test_wpas_ap import wait_ap_ready from test_wpas_ap import wait_ap_ready
def test_wpas_ctrl_network(dev): def test_wpas_ctrl_network(dev):
@ -1695,8 +1695,6 @@ def _test_wpas_ctrl_oom(dev):
3, 'wpa_supplicant_ctrl_iface_wps_nfc_token'), 3, 'wpa_supplicant_ctrl_iface_wps_nfc_token'),
('WPS_NFC_TOKEN NDEF', 'FAIL', ('WPS_NFC_TOKEN NDEF', 'FAIL',
4, 'wpa_supplicant_ctrl_iface_wps_nfc_token'), 4, 'wpa_supplicant_ctrl_iface_wps_nfc_token'),
('WPS_NFC_TOKEN NDEF', 'FAIL',
5, 'wpa_supplicant_ctrl_iface_wps_nfc_token'),
('NFC_REPORT_HANDOVER ROLE TYPE 00 00', 'FAIL', ('NFC_REPORT_HANDOVER ROLE TYPE 00 00', 'FAIL',
1, 'wpas_ctrl_nfc_report_handover'), 1, 'wpas_ctrl_nfc_report_handover'),
('NFC_REPORT_HANDOVER ROLE TYPE 00 00', 'FAIL', ('NFC_REPORT_HANDOVER ROLE TYPE 00 00', 'FAIL',
@ -1707,8 +1705,6 @@ def _test_wpas_ctrl_oom(dev):
1, 'ndef_build_record'), 1, 'ndef_build_record'),
('NFC_GET_HANDOVER_REQ NDEF P2P-CR', None, ('NFC_GET_HANDOVER_REQ NDEF P2P-CR', None,
1, 'wpas_p2p_nfc_handover'), 1, 'wpas_p2p_nfc_handover'),
('NFC_GET_HANDOVER_REQ NDEF P2P-CR', 'FAIL',
2, 'wpas_p2p_nfc_handover'),
('NFC_GET_HANDOVER_REQ NDEF P2P-CR', None, ('NFC_GET_HANDOVER_REQ NDEF P2P-CR', None,
1, 'wps_build_nfc_handover_req_p2p'), 1, 'wps_build_nfc_handover_req_p2p'),
('NFC_GET_HANDOVER_REQ NDEF P2P-CR', 'FAIL', ('NFC_GET_HANDOVER_REQ NDEF P2P-CR', 'FAIL',
@ -1717,16 +1713,6 @@ def _test_wpas_ctrl_oom(dev):
1, 'wpas_ctrl_nfc_get_handover_sel_p2p'), 1, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('NFC_GET_HANDOVER_SEL NDEF P2P-CR', None, ('NFC_GET_HANDOVER_SEL NDEF P2P-CR', None,
1, 'wpas_ctrl_nfc_get_handover_sel_p2p'), 1, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('NFC_GET_HANDOVER_SEL NDEF P2P-CR-TAG', 'FAIL',
2, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('NFC_GET_HANDOVER_SEL NDEF P2P-CR', 'FAIL',
2, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('NFC_GET_HANDOVER_SEL NDEF P2P-CR-TAG', 'FAIL',
3, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('NFC_GET_HANDOVER_SEL NDEF P2P-CR', 'FAIL',
3, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('NFC_GET_HANDOVER_SEL NDEF P2P-CR', 'FAIL',
4, 'wpas_ctrl_nfc_get_handover_sel_p2p'),
('P2P_ASP_PROVISION_RESP 00:11:22:33:44:55 id=1', 'FAIL', ('P2P_ASP_PROVISION_RESP 00:11:22:33:44:55 id=1', 'FAIL',
1, 'p2p_parse_asp_provision_cmd'), 1, 'p2p_parse_asp_provision_cmd'),
('P2P_SERV_DISC_REQ 00:11:22:33:44:55 02000001', 'FAIL', ('P2P_SERV_DISC_REQ 00:11:22:33:44:55 02000001', 'FAIL',
@ -1787,7 +1773,7 @@ def _test_wpas_ctrl_oom(dev):
with alloc_fail(dev[0], count, func): with alloc_fail(dev[0], count, func):
res = dev[0].request(cmd) res = dev[0].request(cmd)
if exp and exp not in res: if exp and exp not in res:
raise Exception("Unexpected success for '%s' during OOM" % cmd) raise Exception("Unexpected success for '%s' during OOM (%d:%s)" % (cmd, count, func))
tests = [ ('FOO', None, tests = [ ('FOO', None,
1, 'wpa_supplicant_global_ctrl_iface_process'), 1, 'wpa_supplicant_global_ctrl_iface_process'),
@ -1799,6 +1785,22 @@ def _test_wpas_ctrl_oom(dev):
if exp and exp not in res: if exp and exp not in res:
raise Exception("Unexpected success for '%s' during OOM" % cmd) raise Exception("Unexpected success for '%s' during OOM" % cmd)
def test_wpas_ctrl_error(dev):
"""Various wpa_supplicant ctrl_iface error cases"""
tests = [ ('WPS_NFC_TOKEN NDEF', 'FAIL',
1, 'wpa_supplicant_ctrl_iface_wps_nfc_token'),
('WPS_NFC_TOKEN NDEF', 'FAIL',
2, 'wpa_supplicant_ctrl_iface_wps_nfc_token'),
('NFC_GET_HANDOVER_REQ NDEF P2P-CR', None,
1, 'wpas_p2p_nfc_handover'),
('NFC_GET_HANDOVER_REQ NDEF P2P-CR', None,
1, 'wps_build_nfc_handover_req_p2p') ]
for cmd,exp,count,func in tests:
with fail_test(dev[0], count, func):
res = dev[0].request(cmd)
if exp and exp not in res:
raise Exception("Unexpected success for '%s' during failure testing (%d:%s)" % (cmd, count, func))
def test_wpas_ctrl_socket_full(dev, apdev, test_params): def test_wpas_ctrl_socket_full(dev, apdev, test_params):
"""wpa_supplicant control socket and full send buffer""" """wpa_supplicant control socket and full send buffer"""
if not dev[0].ping(): if not dev[0].ping():