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

tests: Fix ap_wps_wpa_cli_action outside VM

Browse source 
Pass absolute path to the daemonized wpa_cli process and add read
privileges for everyone on the action script to make this test case work
better when run without a VM.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-07-23 20:48:33 +03:00 committed by Jouni Malinen
parent de01710b08
commit 8936b095ea
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/hwsim/test_ap_wps.py
View file

@ -2726,12 +2726,10 @@ def _test_ap_wps_er_oom(dev, apdev):
def test_ap_wps_wpa_cli_action(dev, apdev, test_params): def test_ap_wps_wpa_cli_action(dev, apdev, test_params):
"""WPS events and wpa_cli action script""" """WPS events and wpa_cli action script"""
pidfile = os.path.join(test_params['logdir'], logdir = os.path.abspath(test_params['logdir'])
'ap_wps_wpa_cli_action.wpa_cli.pid') pidfile = os.path.join(logdir, 'ap_wps_wpa_cli_action.wpa_cli.pid')
logfile = os.path.join(test_params['logdir'], logfile = os.path.join(logdir, 'ap_wps_wpa_cli_action.wpa_cli.res')
'ap_wps_wpa_cli_action.wpa_cli.res') actionfile = os.path.join(logdir, 'ap_wps_wpa_cli_action.wpa_cli.action.sh')
actionfile = os.path.join(test_params['logdir'],
'ap_wps_wpa_cli_action.wpa_cli.action.sh')
with open(actionfile, 'w') as f: with open(actionfile, 'w') as f:
f.write('#!/bin/sh\n') f.write('#!/bin/sh\n')
@ -2741,7 +2739,8 @@ def test_ap_wps_wpa_cli_action(dev, apdev, test_params):
# eloop SIGALRM signal has been scheduled. # eloop SIGALRM signal has been scheduled.
f.write('if [ $2 = "WPS-SUCCESS" -a -r %s ]; then kill `cat %s`; sleep 1; fi\n' % (pidfile, pidfile)) f.write('if [ $2 = "WPS-SUCCESS" -a -r %s ]; then kill `cat %s`; sleep 1; fi\n' % (pidfile, pidfile))
os.chmod(actionfile, stat.S_IREAD | stat.S_IEXEC) os.chmod(actionfile, stat.S_IREAD | stat.S_IWRITE | stat.S_IEXEC |
stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
ssid = "test-wps-conf" ssid = "test-wps-conf"
hostapd.add_ap(apdev[0]['ifname'], hostapd.add_ap(apdev[0]['ifname'],