summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-06-23 04:03:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-06-23 04:03:40 +0000
commit29c2a9a3bf26e2491daa35cc260116d8e30fafde (patch)
tree4ba7e8cf4ecafb498abbb2ab7cfab19cfcbb5c9d
parentee477e993beab3674bfa15935d0d9bb0f31c0be2 (diff)
parentb9afed14e5641585b637e192e9b995f617e50a6b (diff)
downloadplatform_tools_test_connectivity-29c2a9a3bf26e2491daa35cc260116d8e30fafde.tar.gz
platform_tools_test_connectivity-29c2a9a3bf26e2491daa35cc260116d8e30fafde.tar.bz2
platform_tools_test_connectivity-29c2a9a3bf26e2491daa35cc260116d8e30fafde.zip
Merge "Added Voice RAT info before making call am: 761b3a6418 am: 804c05c9b5 am: 4d897180f7 am: 6a4026b9e6" into oc-dev
-rw-r--r--acts/framework/acts/test_utils/tel/tel_voice_utils.py18
-rw-r--r--acts/tests/google/tel/live/TelLiveMobilityStressTest.py6
-rw-r--r--acts/tests/google/tel/live/TelLiveSinglePhoneStressTest.py4
3 files changed, 28 insertions, 0 deletions
diff --git a/acts/framework/acts/test_utils/tel/tel_voice_utils.py b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
index 94bf9344a3..cf155ae98f 100644
--- a/acts/framework/acts/test_utils/tel/tel_voice_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
@@ -978,6 +978,24 @@ def phone_idle_2g_for_subscription(log, ad, sub_id):
return wait_for_network_generation_for_subscription(
log, ad, sub_id, GEN_2G, voice_or_data=NETWORK_SERVICE_VOICE)
+def get_current_voice_rat(log, ad):
+ """Return current Voice RAT
+
+ Args:
+ ad: Android device object.
+ """
+ return get_current_voice_rat_for_subscription(
+ log, ad, get_outgoing_voice_sub_id(ad))
+
+def get_current_voice_rat_for_subscription(log, ad, sub_id):
+ """Return current Voice RAT for subscription id.
+
+ Args:
+ ad: Android device object.
+ sub_id: subscription id.
+ """
+ return get_network_rat_for_subscription(log, ad, sub_id,
+ NETWORK_SERVICE_VOICE)
def is_phone_in_call_volte(log, ad):
"""Return if phone is in VoLTE call.
diff --git a/acts/tests/google/tel/live/TelLiveMobilityStressTest.py b/acts/tests/google/tel/live/TelLiveMobilityStressTest.py
index 75a76d7bf3..134fbb6171 100644
--- a/acts/tests/google/tel/live/TelLiveMobilityStressTest.py
+++ b/acts/tests/google/tel/live/TelLiveMobilityStressTest.py
@@ -55,6 +55,7 @@ from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import get_current_voice_rat
from acts.utils import rand_ascii_str
from TelWifiVoiceTest import TelWifiVoiceTest
from TelWifiVoiceTest import ATTEN_NAME_FOR_WIFI_2G
@@ -234,6 +235,11 @@ class TelLiveMobilityStressTest(TelWifiVoiceTest):
ads = [self.dut, self.helper]
random.shuffle(ads)
total_count += 1
+ # Current Voice RAT
+ self.dut.log.info("Current Voice RAT is %s",
+ get_current_voice_rat(self.log, self.dut))
+ self.helper.log.info("Current Voice RAT is %s",
+ get_current_voice_rat(self.log, self.helper))
if not self._make_phone_call(ads):
failure += 1
self.log.error("New call test failure: %s/%s", failure,
diff --git a/acts/tests/google/tel/live/TelLiveSinglePhoneStressTest.py b/acts/tests/google/tel/live/TelLiveSinglePhoneStressTest.py
index b24e9085e6..db6e824cae 100644
--- a/acts/tests/google/tel/live/TelLiveSinglePhoneStressTest.py
+++ b/acts/tests/google/tel/live/TelLiveSinglePhoneStressTest.py
@@ -49,6 +49,7 @@ from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
+from acts.test_utils.tel.tel_voice_utils import get_current_voice_rat
from acts.utils import rand_ascii_str
@@ -146,6 +147,9 @@ class TelLiveSinglePhoneStressTest(TelephonyBaseTest):
self.dut.log.info(dict(self.result_info))
self.result_info["Total Calls"] += 1
duration = random.randrange(1, self.max_phone_call_duration)
+ # Current Voice RAT
+ self.dut.log.info("Current Voice RAT is %s",
+ get_current_voice_rat(self.log, self.dut))
self.dut.log.info("Make call to %s with call duration %s",
self.call_server_number, duration)
if not initiate_call(self.log, self.dut, self.call_server_number):