cheets_CTSHelper: rename to cheets_StartAndroid
Descriptive name for test logs into Chrome and launches/prepares Android
for testing.
BUG=CHROME:716924
TEST=test_that $DUT cheets_StartAndroid
CQ-DEPEND=I6545dabf6a87ebe7843d360cf90073a65f1f6c59
Change-Id: Idaf830da9bf174a8d6c740980174f7f6510d191c
Reviewed-on: https://chromium-review.googlesource.com/491446
Commit-Ready: Po-Hsien Wang <pwang@chromium.org>
Tested-by: Po-Hsien Wang <pwang@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
diff --git a/client/site_tests/cheets_CTSHelper/cheets_CTSHelper.py b/client/site_tests/cheets_StartAndroid/cheets_StartAndroid.py
similarity index 92%
rename from client/site_tests/cheets_CTSHelper/cheets_CTSHelper.py
rename to client/site_tests/cheets_StartAndroid/cheets_StartAndroid.py
index 9d15426..26da431 100644
--- a/client/site_tests/cheets_CTSHelper/cheets_CTSHelper.py
+++ b/client/site_tests/cheets_StartAndroid/cheets_StartAndroid.py
@@ -9,7 +9,7 @@
from autotest_lib.client.bin import test
-class cheets_CTSHelper(test.test):
+class cheets_StartAndroid(test.test):
"""Helper to run Android's CTS on autotest.
Android CTS needs a running Android, which depends on a logged in ChromeOS
@@ -25,7 +25,7 @@
# Run stress test by logging in and starting ARC several times.
# Each iteration is about 15s on Samus.
for i in range(count):
- logging.info('cheets_CTSHelper iteration %d', i)
+ logging.info('cheets_StartAndroid iteration %d', i)
with chrome.Chrome(
arc_mode=arc.arc_common.ARC_MODE_ENABLED,
dont_override_profile=dont_override_profile) as _:
@@ -40,7 +40,7 @@
except:
# We are going to paper over some failures here. Notice these
# should still be detected by regularly running
- # cheets_CTSHelper.stress.
+ # cheets_StartAndroid.stress.
logging.error('Could not start Chrome. Retrying soon...')
# Give system a chance to calm down.
time.sleep(20)
diff --git a/client/site_tests/cheets_CTSHelper/control b/client/site_tests/cheets_StartAndroid/control
similarity index 85%
rename from client/site_tests/cheets_CTSHelper/control
rename to client/site_tests/cheets_StartAndroid/control
index 836b7d2..41f451f 100644
--- a/client/site_tests/cheets_CTSHelper/control
+++ b/client/site_tests/cheets_StartAndroid/control
@@ -4,7 +4,7 @@
#
AUTHOR = "ARC Team"
-NAME = "cheets_CTSHelper"
+NAME = "cheets_StartAndroid"
TIME = "SHORT"
TEST_CATEGORY = "Functional"
TEST_CLASS = "login"
@@ -16,4 +16,4 @@
See also cheets_CTS for more details.
"""
-job.run_test('cheets_CTSHelper')
+job.run_test('cheets_StartAndroid')
diff --git a/client/site_tests/cheets_CTSHelper/control.smoke b/client/site_tests/cheets_StartAndroid/control.smoke
similarity index 80%
rename from client/site_tests/cheets_CTSHelper/control.smoke
rename to client/site_tests/cheets_StartAndroid/control.smoke
index 9a26903..4632187 100644
--- a/client/site_tests/cheets_CTSHelper/control.smoke
+++ b/client/site_tests/cheets_StartAndroid/control.smoke
@@ -5,7 +5,7 @@
AUTHOR = "ARC Team"
ATTRIBUTES = "suite:smoke"
-NAME = "cheets_CTSHelper.smoke"
+NAME = "cheets_StartAndroid.smoke"
TIME = "MEDIUM"
TEST_CATEGORY = "Functional"
TEST_CLASS = "login"
@@ -15,4 +15,4 @@
This test verifies in the VM a single login to the browser and start of ARC.
"""
-job.run_test('cheets_CTSHelper', count=1, tag='sanity')
+job.run_test('cheets_StartAndroid', count=1, tag='sanity')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.0 b/client/site_tests/cheets_StartAndroid/control.stress.0
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.0
rename to client/site_tests/cheets_StartAndroid/control.stress.0
index 3296e70..32e0158 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.0
+++ b/client/site_tests/cheets_StartAndroid/control.stress.0
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.0"
+NAME = "cheets_StartAndroid.stress.0"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.1 b/client/site_tests/cheets_StartAndroid/control.stress.1
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.1
rename to client/site_tests/cheets_StartAndroid/control.stress.1
index 18b40a1..d064374 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.1
+++ b/client/site_tests/cheets_StartAndroid/control.stress.1
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.1"
+NAME = "cheets_StartAndroid.stress.1"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.2 b/client/site_tests/cheets_StartAndroid/control.stress.2
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.2
rename to client/site_tests/cheets_StartAndroid/control.stress.2
index c650b13..378cbc8 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.2
+++ b/client/site_tests/cheets_StartAndroid/control.stress.2
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.2"
+NAME = "cheets_StartAndroid.stress.2"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.3 b/client/site_tests/cheets_StartAndroid/control.stress.3
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.3
rename to client/site_tests/cheets_StartAndroid/control.stress.3
index 4df7332..d581c484 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.3
+++ b/client/site_tests/cheets_StartAndroid/control.stress.3
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.3"
+NAME = "cheets_StartAndroid.stress.3"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.4 b/client/site_tests/cheets_StartAndroid/control.stress.4
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.4
rename to client/site_tests/cheets_StartAndroid/control.stress.4
index 884a72d..76113c0 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.4
+++ b/client/site_tests/cheets_StartAndroid/control.stress.4
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.4"
+NAME = "cheets_StartAndroid.stress.4"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.5 b/client/site_tests/cheets_StartAndroid/control.stress.5
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.5
rename to client/site_tests/cheets_StartAndroid/control.stress.5
index 977de21..1f1c334 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.5
+++ b/client/site_tests/cheets_StartAndroid/control.stress.5
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.5"
+NAME = "cheets_StartAndroid.stress.5"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.6 b/client/site_tests/cheets_StartAndroid/control.stress.6
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.6
rename to client/site_tests/cheets_StartAndroid/control.stress.6
index cecfcca..00d9387 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.6
+++ b/client/site_tests/cheets_StartAndroid/control.stress.6
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.6"
+NAME = "cheets_StartAndroid.stress.6"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.7 b/client/site_tests/cheets_StartAndroid/control.stress.7
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.7
rename to client/site_tests/cheets_StartAndroid/control.stress.7
index 97eac4e..75a96b6 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.7
+++ b/client/site_tests/cheets_StartAndroid/control.stress.7
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.7"
+NAME = "cheets_StartAndroid.stress.7"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.8 b/client/site_tests/cheets_StartAndroid/control.stress.8
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.8
rename to client/site_tests/cheets_StartAndroid/control.stress.8
index 8fb6d06..4c908a6 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.8
+++ b/client/site_tests/cheets_StartAndroid/control.stress.8
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.8"
+NAME = "cheets_StartAndroid.stress.8"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/client/site_tests/cheets_CTSHelper/control.stress.9 b/client/site_tests/cheets_StartAndroid/control.stress.9
similarity index 86%
rename from client/site_tests/cheets_CTSHelper/control.stress.9
rename to client/site_tests/cheets_StartAndroid/control.stress.9
index 5c3b09a..3475269 100644
--- a/client/site_tests/cheets_CTSHelper/control.stress.9
+++ b/client/site_tests/cheets_StartAndroid/control.stress.9
@@ -7,7 +7,7 @@
# Do not remove any of these suites without wider discussion as it will cause
# instability in the testing lab.
ATTRIBUTES = "suite:arc-bvt-cq, suite:bvt-cq, suite:bvt-inline"
-NAME = "cheets_CTSHelper.stress.9"
+NAME = "cheets_StartAndroid.stress.9"
TIME = "LONG"
TEST_CATEGORY = "Stress"
TEST_CLASS = "login"
@@ -19,4 +19,4 @@
flaky as well.
"""
-job.run_test('cheets_CTSHelper', count=10, tag='stress')
+job.run_test('cheets_StartAndroid', count=10, tag='stress')
diff --git a/server/cros/tradefed_test.py b/server/cros/tradefed_test.py
index f52b75c..9aad817 100644
--- a/server/cros/tradefed_test.py
+++ b/server/cros/tradefed_test.py
@@ -84,7 +84,7 @@
logging.info('Ensure Android is running...')
# If we can't login to Chrome and launch Android we want this job to
# die roughly after 5 minutes instead of hanging for the duration.
- autotest.Autotest(self._host).run_timed_test('cheets_CTSHelper',
+ autotest.Autotest(self._host).run_timed_test('cheets_StartAndroid',
timeout=300,
check_client_result=True,
**self._cts_helper_kwargs)
