diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-08 23:26:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-08 23:26:05 +0000 |
| commit | 303627db6cd433f6a74f7275a9b37b07f784bf29 (patch) | |
| tree | 25065838c0a447c09f7a26787b1fec80efa32b02 | |
| parent | 872fbfd81a59fe4f4fed3cc0be8b0ee4ec1c68b1 (diff) | |
| parent | 480498dcd58bc534bf8c51b8c596dc6038f7e5a1 (diff) | |
| download | platform_tools_test_connectivity-303627db6cd433f6a74f7275a9b37b07f784bf29.tar.gz platform_tools_test_connectivity-303627db6cd433f6a74f7275a9b37b07f784bf29.tar.bz2 platform_tools_test_connectivity-303627db6cd433f6a74f7275a9b37b07f784bf29.zip | |
Merge "Updating tests that use telephony.get to match new format."
3 files changed, 11 insertions, 6 deletions
diff --git a/acts/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py b/acts/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py index c9378e40cc..135f58373f 100644 --- a/acts/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py +++ b/acts/tests/google/tel/live/TelLiveConnectivityMonitorBaseTest.py @@ -37,6 +37,7 @@ from acts.test_utils.tel.tel_test_utils import fastboot_wipe from acts.test_utils.tel.tel_test_utils import get_device_epoch_time from acts.test_utils.tel.tel_test_utils import get_model_name from acts.test_utils.tel.tel_test_utils import get_operator_name +from acts.test_utils.tel.tel_test_utils import get_outgoing_voice_sub_id from acts.test_utils.tel.tel_test_utils import hangup_call from acts.test_utils.tel.tel_test_utils import last_call_drop_reason from acts.test_utils.tel.tel_test_utils import reboot_device @@ -125,9 +126,11 @@ class TelLiveConnectivityMonitorBaseTest(TelephonyBaseTest): self.ad_reference = self.android_devices[1] self.dut_model = get_model_name(self.dut) self.dut_operator = get_operator_name(self.log, self.dut) - self.dut_capabilities = self.dut.telephony.get("capabilities", []) - self.dut_wfc_modes = self.dut.telephony.get("wfc_modes", []) - self.reference_capabilities = self.ad_reference.telephony.get( + self.dut_subID = get_outgoing_voice_sub_id(self.dut) + self.dut_capabilities = self.dut.telephony["subscription"][self.dut_subID].get("capabilities", []) + self.dut_wfc_modes = self.dut.telephony["subscription"][self.dut_subID].get("wfc_modes", []) + self.ad_reference_subID = get_outgoing_voice_sub_id(self.ad_reference) + self.reference_capabilities = self.ad_reference.telephony["subscription"][self.ad_reference_subID].get( "capabilities", []) self.dut.log.info("DUT capabilities: %s", self.dut_capabilities) self.skip_reset_between_cases = False diff --git a/acts/tests/google/tel/live/TelLiveRebootStressTest.py b/acts/tests/google/tel/live/TelLiveRebootStressTest.py index 70677e1d45..2936d9e475 100644 --- a/acts/tests/google/tel/live/TelLiveRebootStressTest.py +++ b/acts/tests/google/tel/live/TelLiveRebootStressTest.py @@ -95,8 +95,9 @@ class TelLiveRebootStressTest(TelephonyBaseTest): self.user_params["check_crash"] = False self.skip_reset_between_cases = False - self.dut_capabilities = self.dut.telephony.get("capabilities", []) - self.dut_wfc_modes = self.dut.telephony.get("wfc_modes", []) + self.dut_subID = get_outgoing_voice_sub_id(self.dut) + self.dut_capabilities = self.dut.telephony["subscription"][self.dut_subID].get("capabilities", []) + self.dut_wfc_modes = self.dut.telephony["subscription"][self.dut_subID].get("wfc_modes", []) self.default_testing_func_names = [] for method in ("_check_volte", "_check_vt", "_check_csfb", "_check_tethering", "_check_wfc_apm", diff --git a/acts/tests/google/tel/live/TelLiveSettingsTest.py b/acts/tests/google/tel/live/TelLiveSettingsTest.py index 791e9e7d9f..10b045f545 100644 --- a/acts/tests/google/tel/live/TelLiveSettingsTest.py +++ b/acts/tests/google/tel/live/TelLiveSettingsTest.py @@ -51,7 +51,8 @@ class TelLiveSettingsTest(TelephonyBaseTest): self.number_of_devices = 1 self.stress_test_number = self.get_stress_test_number() self.carrier_configs = dumpsys_carrier_config(self.dut) - self.dut_capabilities = self.dut.telephony.get("capabilities", []) + self.dut_subID = get_outgoing_voice_sub_id(self.dut) + self.dut_capabilities = self.dut.telephony["subscription"][self.dut_subID].get("capabilities", []) @test_tracker_info(uuid="c6149bd6-7080-453d-af37-1f9bd350a764") @TelephonyBaseTest.tel_test_wrap |