Telephony Automation Code: phone_setup_xg should only set data gen.
For voice setup, use phone_setup_voice_xg.
1. Provide utils to only setup data generation.
2. For voice test setup, use phone_setup_voice_xg to setup data + voice.
BUG: 27567418
BUG: 27221286
Change-Id: Ie9e2736770fd7dc7d7fa36cea7f47dd2dd372ead
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 1db2ed5..b089917 100644
--- a/acts/framework/acts/test_utils/tel/tel_voice_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_voice_utils.py
@@ -46,6 +46,7 @@
from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_CDMA_EVDO
from acts.test_utils.tel.tel_defines import NETWORK_MODE_LTE_GSM_WCDMA
from acts.test_utils.tel.tel_subscription_utils import get_outgoing_voice_sub_id
+from acts.test_utils.tel.tel_subscription_utils import get_default_data_sub_id
from acts.test_utils.tel.tel_test_utils import call_reject_leave_message
from acts.test_utils.tel.tel_test_utils import call_setup_teardown
from acts.test_utils.tel.tel_test_utils import ensure_network_generation
@@ -59,6 +60,8 @@
from acts.test_utils.tel.tel_test_utils import get_network_rat
from acts.test_utils.tel.tel_test_utils import get_network_rat_for_subscription
from acts.test_utils.tel.tel_test_utils import is_wfc_enabled
+from acts.test_utils.tel.tel_test_utils import \
+ reset_preferred_network_type_to_allowable_range
from acts.test_utils.tel.tel_test_utils import set_wfc_mode
from acts.test_utils.tel.tel_test_utils import toggle_airplane_mode
from acts.test_utils.tel.tel_test_utils import toggle_volte
@@ -265,47 +268,6 @@
return True
-
-def phone_setup_volte(log, ad):
- """Setup VoLTE enable.
-
- Args:
- ad: android device object.
-
- Returns:
- True: if VoLTE is enabled successfully.
- False: for errors
- """
- return phone_setup_volte_for_subscription(log, ad,
- get_outgoing_voice_sub_id(ad))
-
-
-def phone_setup_volte_for_subscription(log, ad, sub_id):
- """Setup VoLTE enable for subscription id.
-
- Args:
- ad: android device object.
- sub_id: subscription id.
-
- Returns:
- True: if VoLTE is enabled successfully.
- False: for errors
- """
- toggle_airplane_mode(log, ad, False)
- if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
- log.error("{} Disable WFC failed.".format(ad.serial))
- return False
- toggle_volte_for_subscription(log, ad, sub_id, True)
- if not ensure_network_generation_for_subscription(
- log,
- ad,
- sub_id,
- GEN_4G,
- voice_or_data=NETWORK_SERVICE_DATA):
- return False
- return phone_idle_volte_for_subscription(log, ad, sub_id)
-
-
def phone_setup_iwlan(log,
ad,
is_airplane_mode,
@@ -438,6 +400,108 @@
return False
return True
+def phone_setup_data_for_subscription(log, ad, sub_id, network_generation):
+ """Setup Phone <sub_id> Data to <network_generation>
+
+ Args:
+ log: log object
+ ad: android device object
+ sub_id: subscription id
+ network_generation: network generation, e.g. GEN_2G, GEN_3G, GEN_4G
+
+ Returns:
+ True if success, False if fail.
+ """
+ toggle_airplane_mode(log, ad, False)
+ if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
+ log.error("{} Disable WFC failed.".format(ad.serial))
+ return False
+ if not ensure_network_generation_for_subscription(
+ log,
+ ad,
+ sub_id,
+ network_generation,
+ voice_or_data=NETWORK_SERVICE_DATA):
+ return False
+ return True
+
+def phone_setup_4g(log, ad):
+ """Setup Phone default data sub_id data to 4G.
+
+ Args:
+ log: log object
+ ad: android device object
+
+ Returns:
+ True if success, False if fail.
+ """
+ return phone_setup_4g_for_subscription(
+ log, ad, get_default_data_sub_id(ad))
+
+def phone_setup_4g_for_subscription(log, ad, sub_id):
+ """Setup Phone <sub_id> Data to 4G.
+
+ Args:
+ log: log object
+ ad: android device object
+ sub_id: subscription id
+
+ Returns:
+ True if success, False if fail.
+ """
+ return phone_setup_data_for_subscription(log, ad, sub_id, GEN_4G)
+
+def phone_setup_3g(log, ad):
+ """Setup Phone default data sub_id data to 3G.
+
+ Args:
+ log: log object
+ ad: android device object
+
+ Returns:
+ True if success, False if fail.
+ """
+ return phone_setup_3g_for_subscription(
+ log, ad, get_default_data_sub_id(ad))
+
+def phone_setup_3g_for_subscription(log, ad, sub_id):
+ """Setup Phone <sub_id> Data to 3G.
+
+ Args:
+ log: log object
+ ad: android device object
+ sub_id: subscription id
+
+ Returns:
+ True if success, False if fail.
+ """
+ return phone_setup_data_for_subscription(log, ad, sub_id, GEN_3G)
+
+def phone_setup_2g(log, ad):
+ """Setup Phone default data sub_id data to 2G.
+
+ Args:
+ log: log object
+ ad: android device object
+
+ Returns:
+ True if success, False if fail.
+ """
+ return phone_setup_2g_for_subscription(
+ log, ad, get_default_data_sub_id(ad))
+
+def phone_setup_2g_for_subscription(log, ad, sub_id):
+ """Setup Phone <sub_id> Data to 3G.
+
+ Args:
+ log: log object
+ ad: android device object
+ sub_id: subscription id
+
+ Returns:
+ True if success, False if fail.
+ """
+ return phone_setup_data_for_subscription(log, ad, sub_id, GEN_2G)
def phone_setup_csfb(log, ad):
"""Setup phone for CSFB call test.
@@ -446,6 +510,7 @@
Disabled VoLTE.
Args:
+ log: log object
ad: Android device object.
Returns:
@@ -463,6 +528,7 @@
Disabled VoLTE.
Args:
+ log: log object
ad: Android device object.
sub_id: subscription id.
@@ -470,9 +536,8 @@
True if setup successfully.
False for errors.
"""
- toggle_airplane_mode(log, ad, False)
- if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
- log.error("{} Disable WFC failed.".format(ad.serial))
+ if not phone_setup_4g_for_subscription(log, ad, sub_id):
+ log.error("{} failed to set to 4G data.".format(ad.serial))
return False
if ad.droid.imsIsEnhanced4gLteModeSettingEnabledByPlatform():
toggle_volte(log, ad, False)
@@ -490,90 +555,58 @@
return phone_idle_csfb_for_subscription(log, ad, sub_id)
-
-def phone_setup_3g(log, ad):
- """Setup phone for 3G call test.
+def phone_setup_volte(log, ad):
+ """Setup VoLTE enable.
Args:
- ad: Android device object.
+ log: log object
+ ad: android device object.
Returns:
- True if setup successfully.
- False for errors.
+ True: if VoLTE is enabled successfully.
+ False: for errors
"""
- return phone_setup_3g_for_subscription(log, ad,
- get_outgoing_voice_sub_id(ad))
+ return phone_setup_volte_for_subscription(
+ log, ad, get_outgoing_voice_sub_id(ad))
-def phone_setup_3g_for_subscription(log, ad, sub_id):
- """Setup phone for 3G call test for subscription id.
+def phone_setup_volte_for_subscription(log, ad, sub_id):
+ """Setup VoLTE enable for subscription id.
Args:
- ad: Android device object.
+ log: log object
+ ad: android device object.
sub_id: subscription id.
Returns:
+ True: if VoLTE is enabled successfully.
+ False: for errors
+ """
+ if not phone_setup_4g_for_subscription(log, ad, sub_id):
+ log.error("{} failed to set to 4G data.".format(ad.serial))
+ return False
+ toggle_volte_for_subscription(log, ad, sub_id, True)
+ return phone_idle_volte_for_subscription(log, ad, sub_id)
+
+def phone_setup_voice_3g(log, ad):
+ """Setup phone voice to 3G.
+
+ Args:
+ log: log object
+ ad: Android device object.
+
+ Returns:
True if setup successfully.
False for errors.
"""
- toggle_airplane_mode(log, ad, False)
- if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
- log.error("{} Disable WFC failed.".format(ad.serial))
- return False
-
- if not ensure_network_generation_for_subscription(
- log,
- ad,
- sub_id,
- GEN_3G,
- voice_or_data=NETWORK_SERVICE_DATA):
- return False
-
- if not wait_for_voice_attach_for_subscription(log, ad, sub_id,
- MAX_WAIT_TIME_NW_SELECTION):
- return False
-
- return phone_idle_3g_for_subscription(log, ad, sub_id)
-
-
-def phone_setup_voice_3g(log, ad):
return phone_setup_voice_3g_for_subscription(log, ad,
get_outgoing_voice_sub_id(ad))
-
def phone_setup_voice_3g_for_subscription(log, ad, sub_id):
- toggle_airplane_mode(log, ad, False)
- if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
- log.error("{} Disable WFC failed.".format(ad.serial))
- return False
- if not ensure_network_generation_for_subscription(
- log,
- ad,
- sub_id,
- GEN_3G,
- voice_or_data=NETWORK_SERVICE_VOICE):
- return False
- return phone_idle_3g_for_subscription(log, ad, sub_id)
-
-
-def phone_setup_2g(log, ad):
- """Setup phone for 2G call test.
+ """Setup phone voice to 3G for subscription id.
Args:
- ad: Android device object.
-
- Returns:
- True if setup successfully.
- False for errors.
- """
- return phone_setup_2g_for_subscription(log, ad,
- get_outgoing_voice_sub_id(ad))
-
-
-def phone_setup_2g_for_subscription(log, ad, sub_id):
- """Setup phone for 2G call test for subscription id.
-
- Args:
+ log: log object
ad: Android device object.
sub_id: subscription id.
@@ -581,41 +614,49 @@
True if setup successfully.
False for errors.
"""
- toggle_airplane_mode(log, ad, False)
- if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
- log.error("{} Disable WFC failed.".format(ad.serial))
+ if not phone_setup_3g_for_subscription(log, ad, sub_id):
+ log.error("{} failed to set to 3G data.".format(ad.serial))
return False
- if not ensure_network_generation_for_subscription(
- log,
- ad,
- sub_id,
- GEN_2G,
- voice_or_data=NETWORK_SERVICE_DATA):
+ if not wait_for_voice_attach_for_subscription(log, ad, sub_id,
+ MAX_WAIT_TIME_NW_SELECTION):
return False
- return phone_idle_2g_for_subscription(log, ad, sub_id)
-
+ return phone_idle_3g_for_subscription(log, ad, sub_id)
def phone_setup_voice_2g(log, ad):
- return phone_setup_voice_2g_for_subscription(log, ad,
- get_outgoing_voice_sub_id(ad))
+ """Setup phone voice to 2G.
+
+ Args:
+ log: log object
+ ad: Android device object.
+
+ Returns:
+ True if setup successfully.
+ False for errors.
+ """
+ return phone_setup_voice_2g_for_subscription(
+ log, ad, get_outgoing_voice_sub_id(ad))
def phone_setup_voice_2g_for_subscription(log, ad, sub_id):
- toggle_airplane_mode(log, ad, False)
- if not set_wfc_mode(log, ad, WFC_MODE_DISABLED):
- log.error("{} Disable WFC failed.".format(ad.serial))
- return False
+ """Setup phone voice to 2G for subscription id.
- if not ensure_network_generation_for_subscription(
- log,
- ad,
- sub_id,
- GEN_2G,
- voice_or_data=NETWORK_SERVICE_VOICE):
+ Args:
+ log: log object
+ ad: Android device object.
+ sub_id: subscription id.
+
+ Returns:
+ True if setup successfully.
+ False for errors.
+ """
+ if not phone_setup_2g_for_subscription(log, ad, sub_id):
+ log.error("{} failed to set to 2G data.".format(ad.serial))
+ return False
+ if not wait_for_voice_attach_for_subscription(log, ad, sub_id,
+ MAX_WAIT_TIME_NW_SELECTION):
return False
return phone_idle_2g_for_subscription(log, ad, sub_id)
-
def phone_setup_voice_general(log, ad):
"""Setup phone for voice general call test.
@@ -650,11 +691,48 @@
toggle_airplane_mode(log, ad, False)
if not wait_for_voice_attach_for_subscription(log, ad, sub_id,
MAX_WAIT_TIME_NW_SELECTION):
- # if phone can not attach voice, try phone_setup_3g
- return phone_setup_3g_for_subscription(log, ad, sub_id)
-
+ # if phone can not attach voice, try phone_setup_voice_3g
+ return phone_setup_voice_3g_for_subscription(log, ad, sub_id)
return True
+def phone_setup_data_general(log, ad):
+ """Setup phone for data general test.
+
+ Make sure phone attached to data.
+ Make necessary delay.
+
+ Args:
+ ad: Android device object.
+
+ Returns:
+ True if setup successfully.
+ False for errors.
+ """
+ return phone_setup_data_general_for_subscription(
+ log, ad, ad.droid.subscriptionGetDefaultDataSubId())
+
+def phone_setup_data_general_for_subscription(log, ad, sub_id):
+ """Setup phone for data general test for subscription id.
+
+ Make sure phone attached to data.
+ Make necessary delay.
+
+ Args:
+ ad: Android device object.
+ sub_id: subscription id.
+
+ Returns:
+ True if setup successfully.
+ False for errors.
+ """
+ toggle_airplane_mode(log, ad, False)
+ if not wait_for_data_attach_for_subscription(log, ad, sub_id,
+ MAX_WAIT_TIME_NW_SELECTION):
+ # if phone can not attach data, try reset network preference settings
+ reset_preferred_network_type_to_allowable_range(log, ad)
+
+ return wait_for_data_attach_for_subscription(log, ad, sub_id,
+ MAX_WAIT_TIME_NW_SELECTION)
def phone_setup_rat_for_subscription(log, ad, sub_id, network_preference,
rat_family):
diff --git a/acts/tests/google/tel/live/TelLiveDataTest.py b/acts/tests/google/tel/live/TelLiveDataTest.py
index f053736..6eb034c 100644
--- a/acts/tests/google/tel/live/TelLiveDataTest.py
+++ b/acts/tests/google/tel/live/TelLiveDataTest.py
@@ -83,7 +83,7 @@
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
@@ -1537,7 +1537,7 @@
"""
return self._test_tethering_wifi_and_voice_call(
self.android_devices[0], self.android_devices[1], RAT_3G,
- phone_setup_3g, is_phone_in_call_3g)
+ phone_setup_voice_3g, is_phone_in_call_3g)
@TelephonyBaseTest.tel_test_wrap
def test_tethering_wifi_no_password(self):
diff --git a/acts/tests/google/tel/live/TelLiveRebootStressTest.py b/acts/tests/google/tel/live/TelLiveRebootStressTest.py
index 02697a6..fc59790 100644
--- a/acts/tests/google/tel/live/TelLiveRebootStressTest.py
+++ b/acts/tests/google/tel/live/TelLiveRebootStressTest.py
@@ -50,7 +50,7 @@
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import \
@@ -147,7 +147,7 @@
def _check_3g(self, ad, ad_reference):
self.log.info("Check 3G data and CS call")
- if not phone_setup_3g(self.log, ad):
+ if not phone_setup_voice_3g(self.log, ad):
self.log.error("Failed to setup 3G")
return False
if not verify_http_connection(self.log, ad):
diff --git a/acts/tests/google/tel/live/TelLiveSettingsTest.py b/acts/tests/google/tel/live/TelLiveSettingsTest.py
index 26c58bd..51b5883 100644
--- a/acts/tests/google/tel/live/TelLiveSettingsTest.py
+++ b/acts/tests/google/tel/live/TelLiveSettingsTest.py
@@ -44,7 +44,7 @@
from acts.test_utils.tel.tel_test_utils import wait_for_wfc_enabled
from acts.test_utils.tel.tel_test_utils import wait_for_wifi_data_connection
from acts.test_utils.tel.tel_test_utils import WifiUtils
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
@@ -270,7 +270,7 @@
4. DUT WiFi Calling feature bit return False, network rat is not iwlan.
"""
- if not phone_setup_3g(self.log, self.ad):
+ if not phone_setup_voice_3g(self.log, self.ad):
self.log.error("Failed to setup 3G")
return False
return self._wifi_connected_enable_wfc_teardown_wfc(
@@ -369,7 +369,7 @@
4. DUT WiFi Calling feature bit return False, network rat is not iwlan.
"""
- if not phone_setup_3g(self.log, self.ad):
+ if not phone_setup_voice_3g(self.log, self.ad):
self.log.error("Failed to setup 3G")
return False
return self._wifi_connected_enable_wfc_teardown_wfc(
@@ -510,7 +510,7 @@
2. DUT WiFi Calling feature bit return True, network rat is iwlan.
4. DUT WiFI Calling feature bit return False, network rat is not iwlan.
"""
- if not phone_setup_3g(self.log, self.ad):
+ if not phone_setup_voice_3g(self.log, self.ad):
self.log.error("Failed to setup 3G.")
return False
return self._wifi_connected_set_wfc_mode_change_wfc_mode(
@@ -533,7 +533,7 @@
2. DUT WiFi Calling feature bit return True, network rat is iwlan.
4. DUT WiFI Calling feature bit return False, network rat is not iwlan.
"""
- if not phone_setup_3g(self.log, self.ad):
+ if not phone_setup_voice_3g(self.log, self.ad):
self.log.error("Failed to setup 3G.")
return False
return self._wifi_connected_set_wfc_mode_change_wfc_mode(
@@ -628,7 +628,7 @@
2. DUT WiFi Calling feature bit return False, network rat is not iwlan.
4. DUT WiFI Calling feature bit return True, network rat is iwlan.
"""
- if not phone_setup_3g(self.log, self.ad):
+ if not phone_setup_voice_3g(self.log, self.ad):
self.log.error("Failed to setup 3G.")
return False
return self._wifi_connected_set_wfc_mode_change_wfc_mode(
diff --git a/acts/tests/google/tel/live/TelLiveSmokeTest.py b/acts/tests/google/tel/live/TelLiveSmokeTest.py
index 982d0e9..bde7876 100644
--- a/acts/tests/google/tel/live/TelLiveSmokeTest.py
+++ b/acts/tests/google/tel/live/TelLiveSmokeTest.py
@@ -43,7 +43,7 @@
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_csfb
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_iwlan
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
@@ -222,8 +222,8 @@
self.log.info("--------start test_smoke_3g_call_data_sms--------")
ensure_phones_default_state(self.log, ads)
- tasks = [(phone_setup_3g, (self.log, ads[0])),
- (phone_setup_3g, (self.log, ads[1]))]
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])),
+ (phone_setup_voice_3g, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up 3G.")
return False
diff --git a/acts/tests/google/tel/live/TelLiveStressCallTest.py b/acts/tests/google/tel/live/TelLiveStressCallTest.py
index bfc0703..5db26e2 100644
--- a/acts/tests/google/tel/live/TelLiveStressCallTest.py
+++ b/acts/tests/google/tel/live/TelLiveStressCallTest.py
@@ -27,7 +27,7 @@
from acts.test_utils.tel.tel_test_utils import ensure_phone_default_state
from acts.test_utils.tel.tel_test_utils import ensure_phone_idle
from acts.test_utils.tel.tel_test_utils import verify_active_call_number
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_3g
@@ -82,7 +82,7 @@
ad_caller = self.ad_caller
callee_number = self.stress_test_callee_number
asserts.assert_true(
- phone_setup_3g(self.log,
+ phone_setup_voice_3g(self.log,
ad_caller), "Phone Failed to Set Up Properly.")
# Make sure phone is idle.
diff --git a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
index 29b2299..b3e9ecf 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceConfTest.py
@@ -56,7 +56,7 @@
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_2g
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_general
@@ -360,7 +360,7 @@
call_ab_id = self._three_phone_call_mo_add_mo(
[ads[0], ads[1], ads[2]],
- [phone_setup_3g, phone_setup_voice_general,
+ [phone_setup_voice_3g, phone_setup_voice_general,
phone_setup_voice_general], [is_phone_in_call_1x, None, None])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -401,7 +401,7 @@
call_ab_id = self._three_phone_call_mo_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_3g, phone_setup_voice_general,
+ [phone_setup_voice_3g, phone_setup_voice_general,
phone_setup_voice_general], [is_phone_in_call_1x, None, None])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -454,7 +454,7 @@
call_ab_id = self._three_phone_call_mt_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_3g, phone_setup_voice_general,
+ [phone_setup_voice_3g, phone_setup_voice_general,
phone_setup_voice_general], [is_phone_in_call_1x, None, None])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -782,7 +782,7 @@
call_ab_id = self._three_phone_call_mo_add_mo(
[ads[0], ads[1], ads[2]],
- [phone_setup_volte, phone_setup_3g, phone_setup_3g],
+ [phone_setup_volte, phone_setup_voice_3g, phone_setup_voice_3g],
[is_phone_in_call_volte, is_phone_in_call_wcdma,
is_phone_in_call_wcdma])
if call_ab_id is None:
@@ -835,7 +835,7 @@
call_ab_id = self._three_phone_call_mo_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_volte, phone_setup_3g, phone_setup_3g],
+ [phone_setup_volte, phone_setup_voice_3g, phone_setup_voice_3g],
[is_phone_in_call_volte, is_phone_in_call_wcdma,
is_phone_in_call_wcdma])
if call_ab_id is None:
@@ -888,7 +888,7 @@
call_ab_id = self._three_phone_call_mt_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_volte, phone_setup_3g, phone_setup_3g],
+ [phone_setup_volte, phone_setup_voice_3g, phone_setup_voice_3g],
[is_phone_in_call_volte, is_phone_in_call_wcdma,
is_phone_in_call_wcdma])
if call_ab_id is None:
@@ -940,7 +940,7 @@
call_ab_id = self._three_phone_call_mo_add_mo(
[ads[0], ads[1], ads[2]],
- [phone_setup_volte, phone_setup_3g, phone_setup_3g],
+ [phone_setup_volte, phone_setup_voice_3g, phone_setup_voice_3g],
[is_phone_in_call_volte, is_phone_in_call_1x, is_phone_in_call_1x])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -991,7 +991,7 @@
call_ab_id = self._three_phone_call_mo_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_volte, phone_setup_3g, phone_setup_3g],
+ [phone_setup_volte, phone_setup_voice_3g, phone_setup_voice_3g],
[is_phone_in_call_volte, is_phone_in_call_1x, is_phone_in_call_1x])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -1042,7 +1042,7 @@
call_ab_id = self._three_phone_call_mt_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_volte, phone_setup_3g, phone_setup_3g],
+ [phone_setup_volte, phone_setup_voice_3g, phone_setup_voice_3g],
[is_phone_in_call_volte, is_phone_in_call_1x, is_phone_in_call_1x])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -1092,7 +1092,7 @@
call_ab_id = self._three_phone_call_mo_add_mo(
[ads[0], ads[1], ads[2]],
- [phone_setup_3g, phone_setup_voice_general,
+ [phone_setup_voice_3g, phone_setup_voice_general,
phone_setup_voice_general], [is_phone_in_call_3g, None, None])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -1142,7 +1142,7 @@
call_ab_id = self._three_phone_call_mt_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_3g, phone_setup_voice_general,
+ [phone_setup_voice_3g, phone_setup_voice_general,
phone_setup_voice_general], [is_phone_in_call_3g, None, None])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -1192,7 +1192,7 @@
call_ab_id = self._three_phone_call_mo_add_mt(
[ads[0], ads[1], ads[2]],
- [phone_setup_3g, phone_setup_voice_general,
+ [phone_setup_voice_3g, phone_setup_voice_general,
phone_setup_voice_general], [is_phone_in_call_wcdma, None, None])
if call_ab_id is None:
self.log.error("Failed to get call_ab_id")
@@ -7371,8 +7371,8 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
- (self.log, ads[2]))]
+ (phone_setup_voice_3g, (self.log, ads[1])),
+ (phone_setup_voice_3g, (self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -7401,8 +7401,8 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
- (self.log, ads[2]))]
+ (phone_setup_voice_3g, (self.log, ads[1])),
+ (phone_setup_voice_3g, (self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -7431,8 +7431,8 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
- (self.log, ads[2]))]
+ (phone_setup_voice_3g, (self.log, ads[1])),
+ (phone_setup_voice_3g, (self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -7461,8 +7461,8 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
- (self.log, ads[2]))]
+ (phone_setup_voice_3g, (self.log, ads[1])),
+ (phone_setup_voice_3g, (self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -7491,8 +7491,8 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
- (self.log, ads[2]))]
+ (phone_setup_voice_3g, (self.log, ads[1])),
+ (phone_setup_voice_3g, (self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -7521,7 +7521,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -7551,7 +7551,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -7581,7 +7581,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8120,7 +8120,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8150,7 +8150,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8180,7 +8180,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8211,7 +8211,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8240,7 +8240,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8270,7 +8270,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8300,7 +8300,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8331,7 +8331,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8360,7 +8360,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8389,7 +8389,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8419,7 +8419,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8449,7 +8449,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8478,7 +8478,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8507,7 +8507,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8537,7 +8537,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -8567,7 +8567,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1])), (phone_setup_3g,
+ (phone_setup_voice_3g, (self.log, ads[1])), (phone_setup_voice_3g,
(self.log, ads[2]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
diff --git a/acts/tests/google/tel/live/TelLiveVoiceTest.py b/acts/tests/google/tel/live/TelLiveVoiceTest.py
index ce6ca19..d4184ce 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceTest.py
@@ -70,8 +70,7 @@
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_not_iwlan
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_wcdma
from acts.test_utils.tel.tel_voice_utils import is_phone_in_call_volte
-from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
+from acts.test_utils.tel.tel_voice_utils import phone_setup_voice_3g
from acts.test_utils.tel.tel_voice_utils import phone_setup_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import \
@@ -439,7 +438,7 @@
"""
ads = self.android_devices
- tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_3g,
+ tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_voice_3g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -469,7 +468,7 @@
self.log.error("PhoneB not cdma phone, can not 3g 1x. Stop test.")
return False
- tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_3g,
+ tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_voice_3g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -500,7 +499,7 @@
"PhoneB not gsm phone, can not 3g wcdma. Stop test.")
return False
- tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_3g,
+ tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_voice_3g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -524,7 +523,7 @@
"""
ads = self.android_devices
- tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_2g,
+ tasks = [(phone_setup_volte, (self.log, ads[0])), (phone_setup_voice_2g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -906,7 +905,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1]))]
+ (phone_setup_voice_3g, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -932,7 +931,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], False, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1]))]
+ (phone_setup_voice_3g, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -958,7 +957,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], True, WFC_MODE_WIFI_ONLY,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1]))]
+ (phone_setup_voice_3g, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -984,7 +983,7 @@
tasks = [(phone_setup_iwlan,
(self.log, ads[0], True, WFC_MODE_WIFI_PREFERRED,
self.wifi_network_ssid, self.wifi_network_pass)),
- (phone_setup_3g, (self.log, ads[1]))]
+ (phone_setup_voice_3g, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -1031,7 +1030,7 @@
"""
ads = self.android_devices
- tasks = [(phone_setup_3g, (self.log, ads[0])), (phone_setup_3g,
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])), (phone_setup_voice_3g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -1234,7 +1233,7 @@
"""
ads = self.android_devices
- tasks = [(phone_setup_3g, (self.log, ads[0])), (phone_setup_3g,
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])), (phone_setup_voice_3g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -1602,7 +1601,7 @@
MINIMUM_SUCCESS_RATE = .95
ads = self.android_devices
- tasks = [(phone_setup_3g, (self.log, ads[0])), (phone_setup_3g,
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])), (phone_setup_voice_3g,
(self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -2135,7 +2134,7 @@
self.log.error("Not GSM phone, abort this wcdma hold/unhold test.")
return False
- tasks = [(phone_setup_3g, (self.log, ads[0])),
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])),
(phone_setup_voice_general, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -2180,7 +2179,7 @@
self.log.error("Not GSM phone, abort this wcdma hold/unhold test.")
return False
- tasks = [(phone_setup_3g, (self.log, ads[0])),
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])),
(phone_setup_voice_general, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
@@ -2395,7 +2394,7 @@
ads = self.android_devices
tasks = [(phone_setup_voice_general, (self.log, ads[0])),
- (phone_setup_3g, (self.log, ads[1]))]
+ (phone_setup_voice_3g, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -2422,7 +2421,7 @@
ads = self.android_devices
tasks = [(phone_setup_voice_general, (self.log, ads[1])),
- (phone_setup_2g, (self.log, ads[0]))]
+ (phone_setup_voice_2g, (self.log, ads[0]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
return False
@@ -2764,7 +2763,7 @@
"""
ads = self.android_devices
- tasks = [(phone_setup_3g, (self.log, ads[0])),
+ tasks = [(phone_setup_voice_3g, (self.log, ads[0])),
(phone_setup_voice_general, (self.log, ads[1]))]
if not multithread_func(self.log, tasks):
self.log.error("Phone Failed to Set Up Properly.")
diff --git a/acts/tests/google/tel/live/TelPowerTest.py b/acts/tests/google/tel/live/TelPowerTest.py
index 85d5624..1dfa83d 100644
--- a/acts/tests/google/tel/live/TelPowerTest.py
+++ b/acts/tests/google/tel/live/TelPowerTest.py
@@ -32,8 +32,8 @@
from acts.test_utils.tel.tel_voice_utils import phone_idle_3g
from acts.test_utils.tel.tel_voice_utils import phone_idle_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_idle_volte
-from acts.test_utils.tel.tel_voice_utils import phone_setup_3g
-from acts.test_utils.tel.tel_voice_utils import phone_setup_2g
+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_csfb
from acts.test_utils.tel.tel_voice_utils import phone_setup_iwlan
from acts.test_utils.tel.tel_voice_utils import phone_setup_volte
@@ -312,7 +312,7 @@
self._setup_phone_active_call,
PASS_CRITERIA,
phone_check_func_after_power_test=is_phone_in_call_3g,
- phone_setup_func=phone_setup_3g,
+ phone_setup_func=phone_setup_voice_3g,
phone_idle_check_func=phone_idle_3g,
phone_in_call_check_func=is_phone_in_call_3g)
@@ -752,7 +752,7 @@
PASS_CRITERIA = DEFAULT_POWER_PASS_CRITERIA
def _idle_3g(ad):
- if not phone_setup_3g(self.log, ad):
+ if not phone_setup_voice_3g(self.log, ad):
self.log.error("Phone failed to setup 3g.")
return False
ad.droid.goToSleepNow()
@@ -868,7 +868,7 @@
result = self._test_power_idle("test_power_idle_3g_wakeup_ping",
self._setup_phone_idle_and_wakeup_ping,
PASS_CRITERIA,
- phone_setup_func=phone_setup_3g)
+ phone_setup_func=phone_setup_voice_3g)
return result
# TODO: This one is not working right now. Requires SL4A API to start alarm.
@@ -898,7 +898,7 @@
result = self._test_power_idle("test_power_mobile_data_always_on_wcdma",
self._setup_phone_mobile_data_always_on,
PASS_CRITERIA,
- phone_setup_func=phone_setup_3g,
+ phone_setup_func=phone_setup_voice_3g,
connect_wifi=False)
set_mobile_data_always_on(self.ad, False)
return result
@@ -914,7 +914,7 @@
result = self._test_power_idle("test_power_mobile_data_always_on_1xevdo",
self._setup_phone_mobile_data_always_on,
PASS_CRITERIA,
- phone_setup_func=phone_setup_3g,
+ phone_setup_func=phone_setup_voice_3g,
connect_wifi=False)
set_mobile_data_always_on(self.ad, False)
return result
@@ -930,7 +930,7 @@
result = self._test_power_idle("test_power_mobile_data_always_on_gsm",
self._setup_phone_mobile_data_always_on,
PASS_CRITERIA,
- phone_setup_func=phone_setup_2g,
+ phone_setup_func=phone_setup_voice_2g,
connect_wifi=False)
set_mobile_data_always_on(self.ad, False)
return result
@@ -968,7 +968,7 @@
"test_power_mobile_data_always_on_wcdma_wifi_on",
self._setup_phone_mobile_data_always_on,
PASS_CRITERIA,
- phone_setup_func=phone_setup_3g,
+ phone_setup_func=phone_setup_voice_3g,
connect_wifi=True,
wifi_ssid=self.wifi_network_ssid_2g,
wifi_password=self.wifi_network_pass_2g)
@@ -988,7 +988,7 @@
"test_power_mobile_data_always_on_1xevdo_wifi_on",
self._setup_phone_mobile_data_always_on,
PASS_CRITERIA,
- phone_setup_func=phone_setup_3g,
+ phone_setup_func=phone_setup_voice_3g,
connect_wifi=True,
wifi_ssid=self.wifi_network_ssid_2g,
wifi_password=self.wifi_network_pass_2g)
@@ -1008,7 +1008,7 @@
"test_power_mobile_data_always_on_gsm_wifi_on",
self._setup_phone_mobile_data_always_on,
PASS_CRITERIA,
- phone_setup_func=phone_setup_2g,
+ phone_setup_func=phone_setup_voice_2g,
connect_wifi=True,
wifi_ssid=self.wifi_network_ssid_2g,
wifi_password=self.wifi_network_pass_2g)
