Update the uuids for TelLiveSmsTest and TelLiveVoiceTest.
am: e088e93146
Change-Id: I93de7e06763b3b5f2d6a5b9e9dd7cb941be13a86
(cherry picked from commit 9e3b757760b4caaf29d389df6710ecce552fcf42)
diff --git a/acts/framework/acts/test_utils/tel/tel_test_utils.py b/acts/framework/acts/test_utils/tel/tel_test_utils.py
index b3350a5..7599c44 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -1794,8 +1794,6 @@
Args:
ad: Android Device Object.
url: The url that file to be downloaded from".
- out_path: Optional. Where to download file to.
- out_path is /sdcard/Download/ by default.
expected_file_size: Optional. Provided if checking the download file meet
expected file size in unit of byte.
remove_file_after_check: Whether to remove the downloaded file after
diff --git a/acts/tests/google/tel/live/TelLiveSmsTest.py b/acts/tests/google/tel/live/TelLiveSmsTest.py
index f1b8301..f3d6ea2 100644
--- a/acts/tests/google/tel/live/TelLiveSmsTest.py
+++ b/acts/tests/google/tel/live/TelLiveSmsTest.py
@@ -1423,7 +1423,7 @@
return self._mt_sms_in_csfb_call(ads)
- @test_tracker_info(uuid="5a0db8b5-102c-4aa8-ab6b-3148f5524866")
+ @test_tracker_info(uuid="bd8e9e80-1955-429f-b122-96b127771bbb")
@TelephonyBaseTest.tel_test_wrap
def test_mms_mo_in_call_csfb(self):
""" Test MO MMS during a MO csfb wcdma/gsm call.
@@ -1449,7 +1449,7 @@
return self._mo_mms_in_csfb_call(ads)
- @test_tracker_info(uuid="a9f74f7a-0ef3-4a98-b252-5efd1191209b")
+ @test_tracker_info(uuid="89d65fd2-fc75-4fc5-a018-2d05a4364304")
@TelephonyBaseTest.tel_test_wrap
def test_mms_mt_in_call_csfb(self):
""" Test MT MMS during a MO csfb wcdma/gsm call.
@@ -1612,7 +1612,7 @@
return self._mo_mms_in_1x_call(ads)
- @test_tracker_info(uuid="4311cb8c-626d-48a9-955b-6505b41c7519")
+ @test_tracker_info(uuid="42fc8c16-4a30-4f63-9728-2639f2b79c4c")
@TelephonyBaseTest.tel_test_wrap
def test_mms_mt_in_call_1x(self):
""" Test MT MMS during a MO 1x call.
@@ -1773,7 +1773,7 @@
return self._mo_mms_in_1x_call(ads)
- @test_tracker_info(uuid="29ed3fea-0409-4b43-9caf-dbbaac7d430f")
+ @test_tracker_info(uuid="4311cb8c-626d-48a9-955b-6505b41c7519")
@TelephonyBaseTest.tel_test_wrap
def test_mms_mt_in_call_csfb_1x(self):
""" Test MT MMS during a MO csfb 1x call.
@@ -2269,7 +2269,7 @@
return self._sms_test_mt(ads)
- @test_tracker_info(uuid="80254125-861f-4f3d-9164-eb9a2699152e")
+ @test_tracker_info(uuid="55d70548-6aee-40e9-b94d-d10de84fb50f")
@TelephonyBaseTest.tel_test_wrap
def test_mms_mo_in_call_vt(self):
""" Test MO MMS, Phone in ongoing VT call.
@@ -2302,7 +2302,7 @@
return self._mms_test_mo(ads)
- @test_tracker_info(uuid="a46074f0-304b-4bb0-a2da-5102ee2be619")
+ @test_tracker_info(uuid="75f97c9a-4397-42f1-bb00-8fc6d04fdf6d")
@TelephonyBaseTest.tel_test_wrap
def test_mms_mt_in_call_vt(self):
""" Test MT MMS, Phone in ongoing VT call.
diff --git a/acts/tests/google/tel/live/TelLiveVoiceTest.py b/acts/tests/google/tel/live/TelLiveVoiceTest.py
index 2c4c05a..4daa395 100644
--- a/acts/tests/google/tel/live/TelLiveVoiceTest.py
+++ b/acts/tests/google/tel/live/TelLiveVoiceTest.py
@@ -2600,7 +2600,7 @@
return two_phone_call_leave_voice_mail(self.log, ads[0], None, None,
ads[1], phone_idle_iwlan)
- @test_tracker_info(uuid="cfc94b2c-8e28-4e6f-b4d3-1cc8af18a52b")
+ @test_tracker_info(uuid="6bd5cf0f-522e-4e4a-99bf-92ae46261d8c")
@TelephonyBaseTest.tel_test_wrap
def test_call_2g_to_2g(self):
""" Test 2g<->2g call functionality.
@@ -2625,7 +2625,7 @@
self.log, ads[0], phone_idle_2g, is_phone_in_call_2g, ads[1],
phone_idle_2g, is_phone_in_call_2g, None)
- @test_tracker_info(uuid="057a2213-8b78-497b-8d65-e6ed87d337cb")
+ @test_tracker_info(uuid="6e24e64f-aa0e-4101-89ed-4cc30c738c7e")
@TelephonyBaseTest.tel_test_wrap
def test_call_2g_to_2g_long(self):
""" Test 2g<->2g call functionality.
@@ -2652,60 +2652,6 @@
self.log, ads[0], phone_idle_2g, is_phone_in_call_2g, ads[1],
phone_idle_2g, is_phone_in_call_2g, None)
- @test_tracker_info(uuid="6e24e64f-aa0e-4101-89ed-4cc30c738c7e")
- @TelephonyBaseTest.tel_test_wrap
- def test_call_3g_to_2g_long(self):
- """ Test 3g<->2g call functionality.
-
- Make Sure PhoneA is in 3g mode.
- Make Sure PhoneB is in 2g mode.
- Call from PhoneA to PhoneB, accept on PhoneB, hang up on PhoneA.
- Call from PhoneA to PhoneB, accept on PhoneB, hang up on PhoneB.
- Call from PhoneB to PhoneA, accept on PhoneA, hang up on PhoneB.
- Call from PhoneB to PhoneA, accept on PhoneA, hang up on PhoneA.
-
- Returns:
- True if pass; False if fail.
- """
- ads = self.android_devices
-
- tasks = [(phone_setup_voice_3g, (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.")
- return False
-
- return two_phone_call_long_seq(
- self.log, ads[0], phone_idle_2g, is_phone_in_call_3g, ads[1],
- phone_idle_2g, is_phone_in_call_2g, None)
-
- @test_tracker_info(uuid="0db7fc8b-4f83-4e30-80ab-cc53c8eff99f")
- @TelephonyBaseTest.tel_test_wrap
- def test_call_2g_to_3g_long(self):
- """ Test 2g<->3g call functionality.
-
- Make Sure PhoneA is in 2g mode.
- Make Sure PhoneB is in 3g mode.
- Call from PhoneA to PhoneB, accept on PhoneB, hang up on PhoneA.
- Call from PhoneA to PhoneB, accept on PhoneB, hang up on PhoneB.
- Call from PhoneB to PhoneA, accept on PhoneA, hang up on PhoneB.
- Call from PhoneB to PhoneA, accept on PhoneA, hang up on PhoneA.
-
- Returns:
- True if pass; False if fail.
- """
- ads = self.android_devices
-
- tasks = [(phone_setup_voice_2g, (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.")
- return False
-
- return two_phone_call_long_seq(
- self.log, ads[0], phone_idle_2g, is_phone_in_call_2g, ads[1],
- phone_idle_2g, is_phone_in_call_3g, None)
-
@test_tracker_info(uuid="d109df55-ac2f-493f-9324-9be1d3d7d6d3")
@TelephonyBaseTest.tel_test_wrap
def test_call_gsm_mo_hold_unhold(self):