tests: Use logdir for config file in wpas_config_file
This reduces use of /tmp for test case specific dynamically created files. Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
parent
54736d8358
commit
ddff4f3c5e
1 changed files with 10 additions and 11 deletions
|
@ -40,11 +40,18 @@ def check_config(config):
|
||||||
raise Exception("Missing ip_addr_end")
|
raise Exception("Missing ip_addr_end")
|
||||||
return data
|
return data
|
||||||
|
|
||||||
def test_wpas_config_file(dev):
|
def test_wpas_config_file(dev, apdev, params):
|
||||||
"""wpa_supplicant config file parsing/writing"""
|
"""wpa_supplicant config file parsing/writing"""
|
||||||
config = "/tmp/test_wpas_config_file.conf"
|
config = os.path.join(params['logdir'], 'wpas_config_file.conf')
|
||||||
if os.path.exists(config):
|
if os.path.exists(config):
|
||||||
os.remove(config)
|
try:
|
||||||
|
os.remove(config)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
try:
|
||||||
|
os.rmdir(config)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
wpas = WpaSupplicant(global_iface='/tmp/wpas-wlan5')
|
||||||
try:
|
try:
|
||||||
|
@ -147,14 +154,6 @@ def test_wpas_config_file(dev):
|
||||||
raise Exception("SAVE_CONFIG (global) succeeded unexpectedly")
|
raise Exception("SAVE_CONFIG (global) succeeded unexpectedly")
|
||||||
|
|
||||||
finally:
|
finally:
|
||||||
try:
|
|
||||||
os.remove(config)
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
os.remove(config + ".tmp")
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
try:
|
try:
|
||||||
os.rmdir(config)
|
os.rmdir(config)
|
||||||
except:
|
except:
|
||||||
|
|
Loading…
Reference in a new issue