commit bdb86170ef9a314b3cc82188e63be741ccb8f4d5
author Girish Moturu <gmoturu@google.com> Mon Jul 20 13:48:55 2020 -0700
committer Girish Moturu <gmoturu@google.com> Mon Jul 20 13:50:49 2020 -0700
tree 5a0f00600e903c062a82b0d452e87ec7c6fac544
parent 594bdbec92319170e0d95ba1d8d584273d6c58cd

[WifiNetworkSuggestionTest] Fix for network suggestion tests

CHERRY PICKED FROM git_master
Once of the changes in git_master did not get merged into rvc-dev for
some reason. Adding the reasons to fix b/161547492

Bug: 161547492
Fixes: 161547492
Test: Verified the changes
Merged-In: I291294d18be4c26e5c42d3b805b71e801936cac1
Merged-In: Idaa8878aa293a6f7ffb5cc48ef509de8ff66f299
Change-Id: I04673783563fa82735f1a3f1f824c609155e9d5b

acts/tests/google/wifi/WifiNetworkSuggestionTest.py

diff --git a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
index ba37b4e..970b83b 100644
--- a/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
+++ b/acts/tests/google/wifi/WifiNetworkSuggestionTest.py
@@ -104,6 +104,10 @@
         if hasattr(self, "hidden_networks") and \
             isinstance(self.hidden_networks, list):
               self.hidden_network = self.hidden_networks[0]
+        if hasattr(self, "passpoint_networks"):
+            self.passpoint_network = self.passpoint_networks[ATT]
+            self.passpoint_network[WifiEnums.SSID_KEY] = \
+                self.passpoint_networks[ATT][WifiEnums.SSID_KEY][0]
         self.dut.droid.wifiRemoveNetworkSuggestions([])
         self.dut.adb.shell(
             "pm disable com.google.android.apps.carrier.carrierwifi")
@@ -623,7 +627,7 @@
         """
         asserts.skip_if(not hasattr(self, "passpoint_networks"),
                         "No passpoint networks, skip this test")
-        passpoint_config = self.passpoint_networks[ATT]
+        passpoint_config = self.passpoint_network
         passpoint_config[WifiEnums.IS_APP_INTERACTION_REQUIRED] = True
         if "carrierId" in passpoint_config:
             self.set_carrier_approved(passpoint_config["carrierId"], True)
@@ -652,7 +656,7 @@
         """
         asserts.skip_if(not hasattr(self, "passpoint_networks"),
                         "No passpoint networks, skip this test")
-        passpoint_config = self.passpoint_networks[ATT]
+        passpoint_config = self.passpoint_network
         if "carrierId" in passpoint_config:
             self.set_carrier_approved(passpoint_config["carrierId"], True)
         self._test_connect_to_wifi_network_reboot_config_store([passpoint_config],
@@ -675,7 +679,7 @@
         """
         asserts.skip_if(not hasattr(self, "passpoint_networks"),
                         "No passpoint networks, skip this test")
-        passpoint_config = self.passpoint_networks[ATT]
+        passpoint_config = self.passpoint_network
         if "carrierId" in passpoint_config:
             self.set_carrier_approved(passpoint_config["carrierId"], True)
         self.dut.log.info("Adding network suggestions")
@@ -734,7 +738,7 @@
         """
         asserts.skip_if(not hasattr(self, "passpoint_networks"),
                         "No passpoint networks, skip this test")
-        passpoint_config = self.passpoint_networks[ATT]
+        passpoint_config = self.passpoint_network
         asserts.skip_if("carrierId" not in passpoint_config,
                         "Not a SIM based passpoint network, skip this test")