Snap for 7633965 from 7830de2eaaca507fe0905635ba2d5e81586f9a17 to sc-release
Change-Id: I305d9513646859efc97a09a933f3beb856184a0f
diff --git a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py b/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
index 716500c..420afb8 100755
--- a/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
+++ b/acts_tests/acts_contrib/test_utils/wifi/wifi_test_utils.py
@@ -726,8 +726,13 @@
networks = ad.droid.wifiGetConfiguredNetworks()
if not networks:
return
+ removed = []
for n in networks:
- ad.droid.wifiForgetNetwork(n['networkId'])
+ if n['networkId'] not in removed:
+ ad.droid.wifiForgetNetwork(n['networkId'])
+ removed.append(n['networkId'])
+ else:
+ continue
try:
event = ad.ed.pop_event(wifi_constants.WIFI_FORGET_NW_SUCCESS,
SHORT_TIMEOUT)
@@ -782,9 +787,11 @@
networks = ad.droid.wifiGetConfiguredNetworks()
if not networks:
return
+ removed = []
for n in networks:
- if net_ssid in n[WifiEnums.SSID_KEY]:
+ if net_ssid in n[WifiEnums.SSID_KEY] and n['networkId'] not in removed:
ad.droid.wifiForgetNetwork(n['networkId'])
+ removed.append(n['networkId'])
try:
event = ad.ed.pop_event(wifi_constants.WIFI_FORGET_NW_SUCCESS,
SHORT_TIMEOUT)