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

tests: Make p2p_messages tests more robust under load

Browse source 
The 50 ms wait time for Action frame response was not sufficient when
the tests are run under heavy load (e.g., multiple VMs in parallel).

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2014-11-27 21:44:01 +02:00 committed by Jouni Malinen
parent 0e02a557d3
commit 54fe526ac4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/hwsim/test_p2p_messages.py
View file

@ -751,7 +751,7 @@ def test_p2p_msg_invitation_req_to_go(dev, apdev):
attrs += p2p_attr_device_info(addr1, config_methods=0x0108) attrs += p2p_attr_device_info(addr1, config_methods=0x0108)
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, peer['listen_freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, peer['listen_freq'], binascii.hexlify(msg['payload'])))
rx_msg = dev[1].mgmt_rx() rx_msg = dev[1].mgmt_rx()
if rx_msg is None: if rx_msg is None:
@ -777,7 +777,7 @@ def test_p2p_msg_invitation_req_to_go(dev, apdev):
attrs += p2p_attr_device_info(addr1, config_methods=0x0108) attrs += p2p_attr_device_info(addr1, config_methods=0x0108)
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, peer['listen_freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, peer['listen_freq'], binascii.hexlify(msg['payload'])))
rx_msg = dev[1].mgmt_rx() rx_msg = dev[1].mgmt_rx()
if rx_msg is None: if rx_msg is None:
@ -856,8 +856,8 @@ def test_p2p_msg_invitation_resp(dev, apdev):
msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=2) msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=2)
attrs = p2p_attr_status() attrs = p2p_attr_status()
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, peer['listen_freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, peer['listen_freq'], binascii.hexlify(msg['payload'])))
time.sleep(0.1) time.sleep(0.25)
if "FAIL" in dev[1].request("SET ext_mgmt_frame_handling 1"): if "FAIL" in dev[1].request("SET ext_mgmt_frame_handling 1"):
raise Exception("Failed to enable external management frame handling") raise Exception("Failed to enable external management frame handling")
@ -876,7 +876,7 @@ def test_p2p_msg_invitation_resp(dev, apdev):
msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=p2p['dialog_token']) msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=p2p['dialog_token'])
attrs = struct.pack("<BB", P2P_ATTR_CAPABILITY, 0) attrs = struct.pack("<BB", P2P_ATTR_CAPABILITY, 0)
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload'])))
invite(dev[0], dev[1]) invite(dev[0], dev[1])
rx_msg = dev[1].mgmt_rx() rx_msg = dev[1].mgmt_rx()
@ -892,7 +892,7 @@ def test_p2p_msg_invitation_resp(dev, apdev):
msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=p2p['dialog_token']) msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=p2p['dialog_token'])
attrs = p2p_attr_channel_list() attrs = p2p_attr_channel_list()
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload'])))
invite(dev[0], dev[1]) invite(dev[0], dev[1])
rx_msg = dev[1].mgmt_rx() rx_msg = dev[1].mgmt_rx()
@ -911,7 +911,7 @@ def test_p2p_msg_invitation_resp(dev, apdev):
0x58, 0x58, 0x04, 0x58, 0x58, 0x04,
81, 1, 15) 81, 1, 15)
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload'])))
invite(dev[0], dev[1]) invite(dev[0], dev[1])
rx_msg = dev[1].mgmt_rx() rx_msg = dev[1].mgmt_rx()
@ -930,7 +930,7 @@ def test_p2p_msg_invitation_resp(dev, apdev):
0x58, 0x58, 0x04, 0x58, 0x58, 0x04,
81, 1, 12) 81, 1, 12)
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload'])))
invite(dev[0], dev[1]) invite(dev[0], dev[1])
rx_msg = dev[1].mgmt_rx() rx_msg = dev[1].mgmt_rx()
@ -946,7 +946,7 @@ def test_p2p_msg_invitation_resp(dev, apdev):
msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=p2p['dialog_token']) msg = p2p_hdr(dst, src, type=P2P_INVITATION_RESP, dialog_token=p2p['dialog_token'])
attrs = p2p_attr_status() attrs = p2p_attr_status()
msg['payload'] += ie_p2p(attrs) msg['payload'] += ie_p2p(attrs)
mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=50 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload']))) mgmt_tx(dev[1], "MGMT_TX {} {} freq={} wait_time=200 no_cck=1 action={}".format(addr0, addr0, rx_msg['freq'], binascii.hexlify(msg['payload'])))
ev = dev[0].wait_global_event(["P2P-GROUP-STARTED"], timeout=15); ev = dev[0].wait_global_event(["P2P-GROUP-STARTED"], timeout=15);
if ev is None: if ev is None: