Merge "Add cases to check if UE detects power changes in serving and neighbor cells"
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 dff12b9..1cbc595 100644
--- a/acts/framework/acts/test_utils/tel/tel_test_utils.py
+++ b/acts/framework/acts/test_utils/tel/tel_test_utils.py
@@ -3493,15 +3493,17 @@
for service in service_list:
nw_rat = get_network_rat_for_subscription(log, ad, sub_id, service)
- ad.log.info("network rat for %s is %s", service, nw_rat)
+ ad.log.info("%s network rat is %s", service, nw_rat)
if nw_rat == RAT_UNKNOWN or not is_valid_rat(nw_rat):
continue
if rat_generation_from_rat(nw_rat) == nw_gen:
- ad.log.info("network rat %s is expected %s", nw_rat, nw_gen)
+ ad.log.info("%s network rat %s is expected %s", service, nw_rat,
+ nw_gen)
return True
else:
- ad.log.info("network rat %s is %s, expecting %s", nw_rat,
+ ad.log.info("%s network rat %s is %s, does not meet expected %s",
+ service, nw_rat,
rat_generation_from_rat(nw_rat), nw_gen)
return False
diff --git a/acts/tests/google/tel/live/TelLiveMobilityStressTest.py b/acts/tests/google/tel/live/TelLiveMobilityStressTest.py
index de49b11..9a5e212 100644
--- a/acts/tests/google/tel/live/TelLiveMobilityStressTest.py
+++ b/acts/tests/google/tel/live/TelLiveMobilityStressTest.py
@@ -199,12 +199,15 @@
def call_test(self):
failure = 0
+ total_count = 0
while time.time() < self.finishing_time:
ads = [self.dut, self.helper]
random.shuffle(ads)
+ total_count += 1
if not self._make_phone_call(ads):
failure += 1
- self.log.error("Call test failure count: %s", failure)
+ self.log.error("New call test failure: %s/%s", failure,
+ total_count)
self._take_bug_report("%s_call_failure" % self.test_name,
time.strftime("%m-%d-%Y-%H-%M-%S"))
self.dut.droid.goToSleepNow()
@@ -213,12 +216,15 @@
def message_test(self):
failure = 0
+ total_count = 0
while time.time() < self.finishing_time:
ads = [self.dut, self.helper]
random.shuffle(ads)
+ total_count += 1
if not self._send_message(ads):
failure += 1
- self.log.error("Messaging test failure count: %s", failure)
+ self.log.error("New messaging test failure: %s/%s", failure,
+ total_count)
#self._take_bug_report("%s_messaging_failure" % self.test_name,
# time.strftime("%m-%d-%Y-%H-%M-%S"))
self.dut.droid.goToSleepNow()
@@ -227,10 +233,13 @@
def data_test(self):
failure = 0
+ total_count = 0
while time.time() < self.finishing_time:
+ total_count += 1
if not self._download_file():
failure += 1
- self.log.error("File download test failure count: %s", failure)
+ self.log.error("New file download test failure: %s/%s",
+ failure, total_count)
#self._take_bug_report("%s_download_failure" % self.test_name,
# time.strftime("%m-%d-%Y-%H-%M-%S"))
self.dut.droid.goToSleepNow()
diff --git a/acts/tests/google/tel/live/TelLiveStressTest.py b/acts/tests/google/tel/live/TelLiveStressTest.py
index 0d0c234..6df6be2 100644
--- a/acts/tests/google/tel/live/TelLiveStressTest.py
+++ b/acts/tests/google/tel/live/TelLiveStressTest.py
@@ -190,12 +190,15 @@
def call_test(self):
failure = 0
+ total_count = 0
while time.time() < self.finishing_time:
ads = [self.dut, self.helper]
random.shuffle(ads)
+ total_count += 1
if not self._make_phone_call(ads):
failure += 1
- self.log.error("Call test failure count: %s", failure)
+ self.log.error("New call test failure: %s/%s", failure,
+ total_count)
self._take_bug_report("%s_call_failure" % self.test_name,
time.strftime("%m-%d-%Y-%H-%M-%S"))
self.dut.droid.goToSleepNow()
@@ -204,26 +207,31 @@
def message_test(self):
failure = 0
+ total_count = 0
while time.time() < self.finishing_time:
ads = [self.dut, self.helper]
random.shuffle(ads)
+ total_count += 1
if not self._send_message(ads):
failure += 1
- self.log.error("Messaging test failure count: %s", failure)
- self._take_bug_report("%s_messaging_failure" % self.test_name,
- time.strftime("%m-%d-%Y-%H-%M-%S"))
+ self.log.error("New messaging test failure: %s/%s", failure,
+ total_count)
+ #self._take_bug_report("%s_messaging_failure" % self.test_name,
+ # time.strftime("%m-%d-%Y-%H-%M-%S"))
self.dut.droid.goToSleepNow()
time.sleep(random.randrange(0, self.max_sleep_time))
return failure
def data_test(self):
failure = 0
+ total_count = 0
while time.time() < self.finishing_time:
if not self._download_file():
failure += 1
- self.log.error("File download test failure count: %s", failure)
- self._take_bug_report("%s_download_failure" % self.test_name,
- time.strftime("%m-%d-%Y-%H-%M-%S"))
+ self.log.error("New file download test failure: %s/%s",
+ failure, total_count)
+ #self._take_bug_report("%s_download_failure" % self.test_name,
+ # time.strftime("%m-%d-%Y-%H-%M-%S"))
self.dut.droid.goToSleepNow()
time.sleep(random.randrange(0, self.max_sleep_time))
return failure
