Add a Nexus TMO control file.

Also bump up the timeouts for the basic tests as they can
take over 5 hours.

BUG=None
TEST=None

Change-Id: I8b43c815762223ae609b25f2b070a69599dc70f3
Reviewed-on: https://chromium-review.googlesource.com/384593
Tested-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Basic b/server/site_tests/android_ACTS/control.Telephony_TMO_Basic
index 3cf6a9b..7682c55 100644
--- a/server/site_tests/android_ACTS/control.Telephony_TMO_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_TMO_Basic
@@ -17,6 +17,6 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_tmo_basic',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 acts_timeout=25200)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus b/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
new file mode 100644
index 0000000..df4ae6e
--- /dev/null
+++ b/server/site_tests/android_ACTS/control.Telephony_TMO_Nexus
@@ -0,0 +1,22 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = 'angli, krisr'
+NAME = 'android_ACTS.Telephony_TMO_Nexus'
+TIME = 'LONG'
+TEST_TYPE = 'Server'
+
+DOC = """
+This test runs telephony Nexus sanity against phones with T-Mobile SIMs.
+"""
+
+def run(machine):
+    job.run_test('android_ACTS',
+                 testbed=hosts.create_testbed(machine),
+                 config_file='android1758-telephony-test-station.config',
+                 test_file='telephony_tmo_nexus',
+                 additional_configs=['simcard_list.json'],
+                 acts_timeout=25200)
+
+parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Basic b/server/site_tests/android_ACTS/control.Telephony_VZW_Basic
index b977f46..3febe63 100644
--- a/server/site_tests/android_ACTS/control.Telephony_VZW_Basic
+++ b/server/site_tests/android_ACTS/control.Telephony_VZW_Basic
@@ -17,6 +17,6 @@
                  config_file='android1758-telephony-test-station.config',
                  test_file='telephony_vzw_basic',
                  additional_configs=['simcard_list.json'],
-                 acts_timeout=18000)
+                 acts_timeout=25200)
 
 parallel_simple(run, machines)
diff --git a/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus b/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
new file mode 100644
index 0000000..7e684ef
--- /dev/null
+++ b/server/site_tests/android_ACTS/control.Telephony_VZW_Nexus
@@ -0,0 +1,22 @@
+# Copyright 2016 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+AUTHOR = 'angli, krisr'
+NAME = 'android_ACTS.Telephony_VZW_Nexus'
+TIME = 'LONG'
+TEST_TYPE = 'Server'
+
+DOC = """
+This test runs telephony Nexus sanity against phones with Verizon SIMs.
+"""
+
+def run(machine):
+    job.run_test('android_ACTS',
+                 testbed=hosts.create_testbed(machine),
+                 config_file='android1758-telephony-test-station.config',
+                 test_file='telephony_vzw_nexus',
+                 additional_configs=['simcard_list.json'],
+                 acts_timeout=25200)
+
+parallel_simple(run, machines)