aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hwsim/test_rrm.py
diff options
context:
space:
mode:
authorMasashi Honma <masashi.honma@gmail.com>2019-01-24 07:45:41 (GMT)
committerJouni Malinen <j@w1.fi>2019-01-26 10:11:35 (GMT)
commitbab493b90486b61c8feb2bc56d1769a08a75ab2a (patch)
tree559b603b78f56d8aa9d9ac6aa8d41c76178ff62f /tests/hwsim/test_rrm.py
parent0dab477335d9ea8d71bdb631aab7483542ed1bd0 (diff)
downloadhostap-bab493b90486b61c8feb2bc56d1769a08a75ab2a.zip
hostap-bab493b90486b61c8feb2bc56d1769a08a75ab2a.tar.gz
hostap-bab493b90486b61c8feb2bc56d1769a08a75ab2a.tar.bz2
tests: Use python3 compatible "except" statement
This patch is made by using 2to3 command. $ find . -name *.py | xargs 2to3 -f except -w -n Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
Diffstat (limited to 'tests/hwsim/test_rrm.py')
-rw-r--r--tests/hwsim/test_rrm.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/hwsim/test_rrm.py b/tests/hwsim/test_rrm.py
index 343a4e3..e498672 100644
--- a/tests/hwsim/test_rrm.py
+++ b/tests/hwsim/test_rrm.py
@@ -1247,7 +1247,7 @@ def test_rrm_beacon_req_table_vht(dev, apdev):
elif report.bssid_str == apdev[1]['bssid']:
if report.opclass != 117 or report.channel != 48:
raise Exception("Incorrect opclass/channel for AP1")
- except Exception, e:
+ except Exception as e:
if isinstance(e, Exception) and str(e) == "AP startup failed":
if not vht_supported():
raise HwsimSkip("80 MHz channel not supported in regulatory information")
@@ -1662,7 +1662,7 @@ def test_rrm_beacon_req_passive_scan_vht(dev, apdev):
logger.info("Received beacon report: " + str(report))
if report.opclass != 128 or report.channel != 36:
raise Exception("Incorrect opclass/channel for AP")
- except Exception, e:
+ except Exception as e:
if isinstance(e, Exception) and str(e) == "AP startup failed":
if not vht_supported():
raise HwsimSkip("80 MHz channel not supported in regulatory information")
@@ -1712,7 +1712,7 @@ def test_rrm_beacon_req_passive_scan_vht160(dev, apdev):
logger.info("Received beacon report: " + str(report))
if report.opclass != 129 or report.channel != 104:
raise Exception("Incorrect opclass/channel for AP")
- except Exception, e:
+ except Exception as e:
if isinstance(e, Exception) and str(e) == "AP startup failed":
raise HwsimSkip("ZA regulatory rule likely did not have DFS requirement removed")
raise