Ensure clean the imsi protection map before the test.
Bug: 150456615
Test: acts WifiNetworkSuggestionTest
Change-Id: I7d32fb6fab724e433811d1f29471b2104c415784
diff --git a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
index d781e90..1cd3911 100644
--- a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
+++ b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
@@ -106,6 +106,7 @@
self.clear_deleted_ephemeral_networks()
wutils.wifi_toggle_state(self.dut, True)
self.dut.ed.clear_all_events()
+ self.clear_carrier_approved(str(self.dut.droid.telephonyGetSimCarrierId()))
def teardown_test(self):
self.dut.droid.wakeLockRelease()
@@ -115,6 +116,7 @@
wutils.reset_wifi(self.dut)
wutils.wifi_toggle_state(self.dut, False)
self.dut.ed.clear_all_events()
+ self.clear_carrier_approved(str(self.dut.droid.telephonyGetSimCarrierId()))
def on_fail(self, test_name, begin_time):
self.dut.take_bug_report(test_name, begin_time)
@@ -636,14 +638,16 @@
asserts.skip_if("carrierId" not in passpoint_config,
"Not a SIM based passpoint network, skip this test")
+ # Ensure the carrier is not approved.
+ asserts.assert_false(
+ self.is_carrier_approved(passpoint_config["carrierId"]),
+ "Carrier shouldn't be approved")
+
self.dut.log.info("Adding network suggestions")
asserts.assert_true(
self.dut.droid.wifiAddNetworkSuggestions([passpoint_config]),
"Failed to add suggestions")
- # Clean the carrier approval in case other test side affect.
- self.clear_carrier_approved(passpoint_config["carrierId"])
-
# Start a new scan to trigger auto-join.
wutils.start_wifi_connection_scan_and_ensure_network_found(
self.dut, passpoint_config[WifiEnums.SSID_KEY])