diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-05-26 08:10:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-05-26 08:10:04 +0000 |
| commit | 83e6c6bb9569979152882975128c0e2bacf62e57 (patch) | |
| tree | c8ca39b776c25a521ae6b6f1f1892c50897b2f56 | |
| parent | 26ba9322f1e9e7308d7a8165bdb83f59421329e5 (diff) | |
| parent | 67333d8e40fc0eff9e466d530ccdbbba10cc17af (diff) | |
| download | platform_tools_test_connectivity-83e6c6bb9569979152882975128c0e2bacf62e57.tar.gz platform_tools_test_connectivity-83e6c6bb9569979152882975128c0e2bacf62e57.tar.bz2 platform_tools_test_connectivity-83e6c6bb9569979152882975128c0e2bacf62e57.zip | |
Merge "Merge "Fixing Mobility Handoff bugs to remove flakiness" am: 16b2529558 am: 0fc755f0f8 am: 540f417052 am: e5391cdc48" into oc-dev
| -rwxr-xr-x | acts/tests/google/tel/live/TelWifiVoiceTest.py | 33 |
1 files changed, 5 insertions, 28 deletions
diff --git a/acts/tests/google/tel/live/TelWifiVoiceTest.py b/acts/tests/google/tel/live/TelWifiVoiceTest.py index 4c437aed35..e1979b30e0 100755 --- a/acts/tests/google/tel/live/TelWifiVoiceTest.py +++ b/acts/tests/google/tel/live/TelWifiVoiceTest.py @@ -3122,36 +3122,13 @@ class TelWifiVoiceTest(TelephonyBaseTest): PhoneA should still be in call. PhoneA should hand-out to LTE. PhoneA should have data on WiFi. """ - # Decrease WiFi RSSI to WIFI_RSSI_FOR_HAND_OUT_TEST_PHONE_NOT_HAND_OUT - # in 10 seconds - set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G], - self.wifi_rssi_with_no_atten, - WIFI_RSSI_FOR_HAND_OUT_TEST_PHONE_NOT_HAND_OUT, 2, 1) - set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], - self.wifi_rssi_with_no_atten, - WIFI_RSSI_FOR_HAND_OUT_TEST_PHONE_NOT_HAND_OUT, 2, 1) - # Make sure WiFi still connected and have data. - if (not wait_for_wifi_data_connection(self.log, - self.android_devices[0], True) or - not verify_http_connection(self.log, self.android_devices[0])): - self.log.error("No Data on Wifi") - return False - # Make sure phone not hand-out, not drop call - if self._phone_wait_for_not_wfc(): - self.log.error("Phone should not hand out.") - return False - if self._is_phone_not_in_call(): - self.log.error("Phone should not drop call.") - return False - # Decrease WiFi RSSI to WIFI_RSSI_FOR_HAND_OUT_TEST_PHONE_HAND_OUT - # in 10 seconds set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G], self.wifi_rssi_with_no_atten, - WIFI_RSSI_FOR_HAND_OUT_TEST_PHONE_HAND_OUT, 2, 1) + MAX_RSSI_RESERVED_VALUE, 2, 1) set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], self.wifi_rssi_with_no_atten, - WIFI_RSSI_FOR_HAND_OUT_TEST_PHONE_HAND_OUT, 2, 1) + MAX_RSSI_RESERVED_VALUE, 2, 1) # Make sure WiFi still connected and have data. if (not wait_for_wifi_data_connection(self.log, self.android_devices[0], True) or @@ -3428,11 +3405,11 @@ class TelWifiVoiceTest(TelephonyBaseTest): PhoneA should still be in call. PhoneA should hand-out to LTE. PhoneA should have data on WiFi. """ - # Increase Cellular RSSI to CELL_STRONG_RSSI_VALUE in 30 seconds + # Increase Cellular RSSI to CELL_STRONG_RSSI_VALUE set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], - self.cell_rssi_with_no_atten, CELL_STRONG_RSSI_VALUE, 1, 1) + self.cell_rssi_with_no_atten, MAX_RSSI_RESERVED_VALUE, 1, 1) set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], - self.cell_rssi_with_no_atten, CELL_STRONG_RSSI_VALUE, 1, 1) + self.cell_rssi_with_no_atten, MAX_RSSI_RESERVED_VALUE, 1, 1) # Make sure phone hand-out, not drop call if not self._phone_wait_for_not_wfc(): self.log.error("Phone should hand out.") |