Skipping setup steps if device is ready
No need to perform so many steps for sim, voice, etc
if device is ready for test.
Test: None
Bug: 171717052
Change-Id: I39a3aa185baee0d988dbcf3c41df8c2f2f38d5d7
diff --git a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
index 3b63c40..caefa5c 100644
--- a/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
+++ b/acts/framework/acts/test_utils/tel/TelephonyBaseTest.py
@@ -278,6 +278,10 @@
if not unlock_sim(ad):
raise signals.TestAbortClass("unable to unlock the SIM")
+ # If device is setup already, skip the following setup procedures
+ if getattr(ad, "telephony_test_setup", None):
+ return True
+
# eSIM enablement
if hasattr(ad, "fi_esim"):
if not ensure_wifi_connected(self.log, ad, self.wifi_network_ssid,
@@ -331,9 +335,6 @@
# Sub ID setup
initial_set_up_for_subid_infomation(self.log, ad)
- # If device is setup already, skip the following setup procedures
- if getattr(ad, "telephony_test_setup", None):
- return True
try:
ad.droid.wifiEnableVerboseLogging(WIFI_VERBOSE_LOGGING_ENABLED)