tests: sigma_dut: set regulatory inside try/except

If sigma_dut is not installed, start_sigma_dut() will
throw an exception. Call start_sigma_dut() inside the
try/except to correctly reset the regulatory domain.

This fixes several seemingly random failures due to
regulatory domain not being reset.

Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
This commit is contained in:
Thomas Pedersen 2020-05-01 14:02:07 -07:00 committed by Jouni Malinen
parent 0388992905
commit 0218bf05d6

View file

@ -4401,9 +4401,9 @@ def run_sigma_dut_ap_channel(dev, apdev, params, channel, mode, scan_freq,
extra=None, check_signal=None, program=None): extra=None, check_signal=None, program=None):
logdir = params['prefix'] + ".sigma-hostapd" logdir = params['prefix'] + ".sigma-hostapd"
with HWSimRadio() as (radio, iface): with HWSimRadio() as (radio, iface):
subprocess.call(['iw', 'reg', 'set', 'US'])
sigma = start_sigma_dut(iface, hostapd_logdir=logdir) sigma = start_sigma_dut(iface, hostapd_logdir=logdir)
try: try:
subprocess.call(['iw', 'reg', 'set', 'US'])
cmd = "ap_reset_default" cmd = "ap_reset_default"
if program: if program:
cmd += ",program," + program cmd += ",program," + program