Fixing Mobility Test Cases
For TelWifiDataTest we need to have a teardown test to set all
the attens to 0 else basic connectivity fails
For weak wifi and cellular weak, script was blindly setting to 80
Increased ping loss tolerance to 40 from 20
Test: On Target
Bug: None
Change-Id: I17aa6a29c179c46bff2197cc7961ffae9ed0ac21
diff --git a/acts/tests/google/tel/live/TelWifiDataTest.py b/acts/tests/google/tel/live/TelWifiDataTest.py
index 62a00aa..feff162 100644
--- a/acts/tests/google/tel/live/TelWifiDataTest.py
+++ b/acts/tests/google/tel/live/TelWifiDataTest.py
@@ -60,6 +60,18 @@
set_rssi(self.log, self.attens[atten_name], 0,
MAX_RSSI_RESERVED_VALUE)
+ def teardown_test(self):
+ super().teardown_test()
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G], 0,
+ MAX_RSSI_RESERVED_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], 0,
+ MAX_RSSI_RESERVED_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], 0,
+ MAX_RSSI_RESERVED_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], 0,
+ MAX_RSSI_RESERVED_VALUE)
+ return True
+
def _basic_connectivity_check(self):
"""
Set Attenuator Value for WiFi and Cell to 0
@@ -180,7 +192,8 @@
total_iteration = self.stress_test_number
ad = self.android_devices[0]
- ping_task = (adb_shell_ping, (ad, DEFAULT_PING_DURATION))
+ ping_task = (adb_shell_ping, (ad, DEFAULT_PING_DURATION,
+ "www.google.com", 200, 40))
irat_task = (self._wifi_cell_irat_task, (ad, DEFAULT_IRAT_DURATION))
current_iteration = 1
while (current_iteration <= total_iteration):
diff --git a/acts/tests/google/tel/live/TelWifiVoiceTest.py b/acts/tests/google/tel/live/TelWifiVoiceTest.py
index 8b6a8c0..b6d765e 100755
--- a/acts/tests/google/tel/live/TelWifiVoiceTest.py
+++ b/acts/tests/google/tel/live/TelWifiVoiceTest.py
@@ -745,10 +745,10 @@
MAX_RSSI_RESERVED_VALUE)
set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], 0,
MAX_RSSI_RESERVED_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], 0,
- CELL_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], 0,
- CELL_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G],
+ self.cell_rssi_with_no_atten, CELL_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G],
+ self.cell_rssi_with_no_atten, CELL_WEAK_RSSI_VALUE)
return True
def _wfc_set_wifi_strong_cell_absent(self):
@@ -765,10 +765,10 @@
def _wfc_set_wifi_weak_cell_strong(self):
self.log.info("--->Setting WiFi weak cell strong<---")
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G], 0,
- WIFI_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], 0,
- WIFI_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G],
+ self.wifi_rssi_with_no_atten, WIFI_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G],
+ self.wifi_rssi_with_no_atten, WIFI_WEAK_RSSI_VALUE)
set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], 0,
MAX_RSSI_RESERVED_VALUE)
set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], 0,
@@ -777,22 +777,22 @@
def _wfc_set_wifi_weak_cell_weak(self):
self.log.info("--->Setting WiFi weak cell weak<---")
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G], 0,
- WIFI_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], 0,
- WIFI_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], 0,
- CELL_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], 0,
- CELL_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G],
+ self.wifi_rssi_with_no_atten, WIFI_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G],
+ self.wifi_rssi_with_no_atten, WIFI_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G],
+ self.cell_rssi_with_no_atten, CELL_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G],
+ self.cell_rssi_with_no_atten, CELL_WEAK_RSSI_VALUE)
return True
def _wfc_set_wifi_weak_cell_absent(self):
self.log.info("--->Setting WiFi weak cell absent<---")
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G], 0,
- WIFI_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], 0,
- WIFI_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_2G],
+ self.wifi_rssi_with_no_atten, WIFI_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G],
+ self.wifi_rssi_with_no_atten, WIFI_WEAK_RSSI_VALUE)
set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], 0,
MIN_RSSI_RESERVED_VALUE)
set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], 0,
@@ -817,10 +817,10 @@
MIN_RSSI_RESERVED_VALUE)
set_rssi(self.log, self.attens[ATTEN_NAME_FOR_WIFI_5G], 0,
MIN_RSSI_RESERVED_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G], 0,
- CELL_WEAK_RSSI_VALUE)
- set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G], 0,
- CELL_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_3G],
+ self.cell_rssi_with_no_atten, CELL_WEAK_RSSI_VALUE)
+ set_rssi(self.log, self.attens[ATTEN_NAME_FOR_CELL_4G],
+ self.cell_rssi_with_no_atten, CELL_WEAK_RSSI_VALUE)
return True
def _wfc_set_wifi_absent_cell_absent(self):
