Telephony Test: clean up tel_defines.py.
1. Move anritsu-specific defines to tel_test_anritsu_utils.py.
2. Reorganize constants in tel_defines.py to group samilair constants together.
3. Change all constant time sleep to WAIT_TIME_XXX_YYY.
4. Change all event wait or status wait to MAX_WAIT_TIME_XXX_YYY.
BUG: 26435963
BUG: 26435962
Change-Id: If6c94bc8c2a914ddbd433fa1479ced85b2994c7b
diff --git a/acts/tests/google/tel/live/TelLivePreflightTest.py b/acts/tests/google/tel/live/TelLivePreflightTest.py
index 5ec690a..1a6967c 100644
--- a/acts/tests/google/tel/live/TelLivePreflightTest.py
+++ b/acts/tests/google/tel/live/TelLivePreflightTest.py
@@ -27,11 +27,11 @@
from acts.test_utils.tel.tel_defines import CAPABILITY_WFC
from acts.test_utils.tel.tel_defines import CAPABILITY_MSIM
from acts.test_utils.tel.tel_defines import CAPABILITY_OMADM
+from acts.test_utils.tel.tel_defines import MAX_WAIT_TIME_NW_SELECTION
from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_BACKGROUND
from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_FOREGROUND
from acts.test_utils.tel.tel_defines import PRECISE_CALL_STATE_LISTEN_LEVEL_RINGING
from acts.test_utils.tel.tel_defines import WAIT_TIME_AFTER_REBOOT
-from acts.test_utils.tel.tel_defines import WAIT_TIME_NW_SELECTION
from acts.test_utils.tel.tel_lookup_tables import device_capabilities
from acts.test_utils.tel.tel_lookup_tables import operator_capabilities
from acts.test_utils.tel.tel_test_utils import ensure_phones_default_state
@@ -65,7 +65,7 @@
toggle_airplane_mode(log, ad, False)
sub_id = ad.droid.subscriptionGetDefaultVoiceSubId()
if not wait_for_voice_attach_for_subscription(
- log, ad, sub_id, WAIT_TIME_NW_SELECTION):
+ log, ad, sub_id, MAX_WAIT_TIME_NW_SELECTION):
log.error("{} didn't find a cell network".format(ad.serial))
return False
return True