Break Telephony tests in suites by carrier.
Due to suite scheduler de-duping a suite cannot be run
on multiple of the same target. What the creates is a
suite that runs on multiple targets:
angler, bullhead, shamu, and sailfish on att
angler, bullhead, shamu, and sailfish on spt
angler, bullhead, shamu, and sailfish on tmo
angler, bullhead, shamu, and sailfish on vzw
Previously it was trying to run a single suite against everything
above which resulted in only one per target (phones) being
scheduled.
BUG=b:32877993
TEST=None
Change-Id: I60dd1b105cb725a46daa9b9bae66b503607e4417
Reviewed-on: https://chromium-review.googlesource.com/411383
Commit-Ready: Kris Rambish <krisr@chromium.org>
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Betty Zhou <bettyzhou@google.com>
Reviewed-by: Dan Shi <dshi@google.com>
diff --git a/server/site_tests/android_ACTS/control.Telephony_ATT_Basic b/server/site_tests/android_ACTS/control.Telephony_ATT_Basic
index 242e026..f8e73da 100644
--- a/server/site_tests/android_ACTS/control.Telephony_ATT_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_ATT_Basic
@@ -6,7 +6,7 @@
NAME = 'android_ACTS.Telephony_ATT_Basic'
TIME = 'LONG'
TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nexus'
+ATTRIBUTES = 'suite:android_telephony_nexus_att'
DEPENDENCIES = 'carrier:att'
DOC = """
diff --git a/server/site_tests/android_ACTS/control.Telephony_SPT_Basic b/server/site_tests/android_ACTS/control.Telephony_SPT_Basic
index d9a65f2..d511f63 100644
--- a/server/site_tests/android_ACTS/control.Telephony_SPT_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_SPT_Basic
@@ -6,7 +6,7 @@
NAME = 'android_ACTS.Telephony_SPT_Basic'
TIME = 'LONG'
TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nexus'
+ATTRIBUTES = 'suite:android_telephony_nexus_spt'
DEPENDENCIES = 'carrier:sprint'
DOC = """
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus b/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
index c3ed000..3361a5c 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
+++ b/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
@@ -6,7 +6,7 @@
NAME = 'android_ACTS.Telephony_TMO_Nexus'
TIME = 'LONG'
TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nexus'
+ATTRIBUTES = 'suite:android_telephony_nexus_tmo'
DEPENDENCIES = 'carrier:tmobile'
DOC = """
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus b/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
index 03052ae..a5dd4b0 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
+++ b/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
@@ -6,7 +6,7 @@
NAME = 'android_ACTS.Telephony_VZW_Nexus'
TIME = 'LONG'
TEST_TYPE = 'Server'
-ATTRIBUTES = 'suite:android_telephony_nexus'
+ATTRIBUTES = 'suite:android_telephony_nexus_vzw'
DEPENDENCIES = 'carrier:verizon'
DOC = """
diff --git a/site_utils/attribute_whitelist.txt b/site_utils/attribute_whitelist.txt
index 4f4e2c2..5f23131 100644
--- a/site_utils/attribute_whitelist.txt
+++ b/site_utils/attribute_whitelist.txt
@@ -1,7 +1,10 @@
suite:AFDO_page_replay
suite:AFDO_record
suite:android_bluetooth
-suite:android_telephony_nexus
+suite:android_telephony_nexus_att
+suite:android_telephony_nexus_spt
+suite:android_telephony_nexus_tmo
+suite:android_telephony_nexus_vzw
suite:android_wifi
suite:android_wifi_interop
suite:android_wifi_connect
diff --git a/test_suites/control.android_telephony_nexus b/test_suites/control.android_telephony_nexus_att
similarity index 92%
rename from test_suites/control.android_telephony_nexus
rename to test_suites/control.android_telephony_nexus_att
index 8a7362c..952d440 100644
--- a/test_suites/control.android_telephony_nexus
+++ b/test_suites/control.android_telephony_nexus_att
@@ -3,8 +3,8 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus'
-PURPOSE = 'Test Android Nexus Telephony Sanity'
+NAME = 'android_telephony_nexus_att'
+PURPOSE = 'Test Android Nexus Telephony Sanity For AT&T'
TIME = 'LONG'
TEST_TYPE = 'Server'
diff --git a/test_suites/control.android_telephony_nexus b/test_suites/control.android_telephony_nexus_spt
similarity index 92%
copy from test_suites/control.android_telephony_nexus
copy to test_suites/control.android_telephony_nexus_spt
index 8a7362c..963c8bf 100644
--- a/test_suites/control.android_telephony_nexus
+++ b/test_suites/control.android_telephony_nexus_spt
@@ -3,8 +3,8 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus'
-PURPOSE = 'Test Android Nexus Telephony Sanity'
+NAME = 'android_telephony_nexus_spt'
+PURPOSE = 'Test Android Nexus Telephony Sanity For Sprint'
TIME = 'LONG'
TEST_TYPE = 'Server'
diff --git a/test_suites/control.android_telephony_nexus b/test_suites/control.android_telephony_nexus_tmo
similarity index 92%
copy from test_suites/control.android_telephony_nexus
copy to test_suites/control.android_telephony_nexus_tmo
index 8a7362c..f309907 100644
--- a/test_suites/control.android_telephony_nexus
+++ b/test_suites/control.android_telephony_nexus_tmo
@@ -3,8 +3,8 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus'
-PURPOSE = 'Test Android Nexus Telephony Sanity'
+NAME = 'android_telephony_nexus_tmo'
+PURPOSE = 'Test Android Nexus Telephony Sanity For T-Mobile'
TIME = 'LONG'
TEST_TYPE = 'Server'
diff --git a/test_suites/control.android_telephony_nexus b/test_suites/control.android_telephony_nexus_vzw
similarity index 92%
copy from test_suites/control.android_telephony_nexus
copy to test_suites/control.android_telephony_nexus_vzw
index 8a7362c..3e9add8 100644
--- a/test_suites/control.android_telephony_nexus
+++ b/test_suites/control.android_telephony_nexus_vzw
@@ -3,8 +3,8 @@
# found in the LICENSE file.
AUTHOR = 'bettyzhou, bmahadev, krisr'
-NAME = 'android_telephony_nexus'
-PURPOSE = 'Test Android Nexus Telephony Sanity'
+NAME = 'android_telephony_nexus_vzw'
+PURPOSE = 'Test Android Nexus Telephony Sanity For Verizon'
TIME = 'LONG'
TEST_TYPE = 'Server'
