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

tests: Fix wpas_ctrl_country and dbus_country with valid db.txt

Browse source 
init=CORE was previously used due to invalid db.txt data for 00. For
now, allow both it and the new init=USER after fixed db.txt.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2015-12-12 12:45:30 +02:00
parent 5b7784a89c
commit be90370bd5
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/hwsim/test_dbus.py
View file

@ -2273,7 +2273,9 @@ def _test_dbus_country(dev, apdev):
ev = dev[0].wait_global_event(["CTRL-EVENT-REGDOM-CHANGE"], timeout=1)
if ev is None:
raise Exception("regdom change event not seen")
if "init=CORE type=WORLD" not in ev:
# init=CORE was previously used due to invalid db.txt data for 00. For
# now, allow both it and the new init=USER after fixed db.txt.
if "init=CORE type=WORLD" not in ev and "init=USER type=WORLD" not in ev:
raise Exception("Unexpected event contents: " + ev)
def test_dbus_scan_interval(dev, apdev):

4
tests/hwsim/test_wpas_ctrl.py
View file

@ -1158,7 +1158,9 @@ def test_wpas_ctrl_country(dev, apdev):
ev = dev[0].wait_global_event(["CTRL-EVENT-REGDOM-CHANGE"], 10)
if ev is None:
raise Exception("regdom change event not seen")
if "init=CORE type=WORLD" not in ev:
# init=CORE was previously used due to invalid db.txt data for 00. For
# now, allow both it and the new init=USER after fixed db.txt.
if "init=CORE type=WORLD" not in ev and "init=USER type=WORLD" not in ev:
raise Exception("Unexpected event contents: " + ev)
finally:
subprocess.call(['iw', 'reg', 'set', '00'])