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

tests: Read sigma_dut-ap.conf as binary data for python3 compatibility

Browse source 
Sending UTF-8 encoded data to logger file is currently not working
properly, so create a separate binary file with a copy of
sigma_dut-ap.conf instead to work with both python2 and python3.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-02-04 16:46:31 +02:00
parent e50c58e585
commit 37df1775ad
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/hwsim/test_sigma_dut.py
View file

@ -2618,6 +2618,8 @@ def test_sigma_dut_ap_hs20(dev, apdev, params):
"""sigma_dut controlled AP with Hotspot 2.0 parameters""" """sigma_dut controlled AP with Hotspot 2.0 parameters"""
logdir = os.path.join(params['logdir'], logdir = os.path.join(params['logdir'],
"sigma_dut_ap_hs20.sigma-hostapd") "sigma_dut_ap_hs20.sigma-hostapd")
conffile = os.path.join(params['logdir'],
"sigma_dut_ap_hs20.sigma-conf")
with HWSimRadio() as (radio, iface): with HWSimRadio() as (radio, iface):
sigma = start_sigma_dut(iface, hostapd_logdir=logdir, debug=True) sigma = start_sigma_dut(iface, hostapd_logdir=logdir, debug=True)
try: try:
@ -2636,8 +2638,9 @@ def test_sigma_dut_ap_hs20(dev, apdev, params):
sigma_dut_cmd_check("ap_set_hs2,NAME,AP,WLAN_TAG,2,OSU,1") sigma_dut_cmd_check("ap_set_hs2,NAME,AP,WLAN_TAG,2,OSU,1")
sigma_dut_cmd_check("ap_config_commit,NAME,AP") sigma_dut_cmd_check("ap_config_commit,NAME,AP")
with open("/tmp/sigma_dut-ap.conf", "r") as f: with open("/tmp/sigma_dut-ap.conf", "rb") as f:
logger.debug("hostapd.conf from sigma_dut:\n" + f.read()) with open(conffile, "wb") as f2:
f2.write(f.read())
sigma_dut_cmd_check("ap_reset_default") sigma_dut_cmd_check("ap_reset_default")
finally: finally: