cheets_CTS_{P,Instant}: Reflect recent generator changes.
* Omits unused skip-media-download options.
* Stopped generating unused CTS_instant modules.
BUG=b:78434482
BUG=b:114165730
BUG=b:114318818
TEST=locally run some tests
Change-Id: Ifffd9860ab85576ab9ce0fe3fc9a4d5c0a99f749
Reviewed-on: https://chromium-review.googlesource.com/1239913
Commit-Ready: Kazuhiro Inaba <kinaba@chromium.org>
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Keith Haddow <haddowk@chromium.org>
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
index bfe666d..b7119c7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccessibilityServiceTestCases',
test_name='cheets_CTS_Instant.arm.CtsAccessibilityServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
index f9f57b2..1820cce 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccessibilityTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccessibilityTestCases',
test_name='cheets_CTS_Instant.arm.CtsAccessibilityTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
index 6ef4470..077d3fc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAccountManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccountManagerTestCases',
test_name='cheets_CTS_Instant.arm.CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccountManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
index fe3ead4..9faef42 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAnimationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAnimationTestCases',
test_name='cheets_CTS_Instant.arm.CtsAnimationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAnimationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAnimationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
index 57e6cce..af0979d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppSecurityHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppSecurityHostTestCases',
test_name='cheets_CTS_Instant.arm.CtsAppSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAppSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppSecurityHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
index 816faee..0a2922b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAppWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppWidgetTestCases',
test_name='cheets_CTS_Instant.arm.CtsAppWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAppWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppWidgetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
index 9b92702..af98072 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsAutoFillServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAutoFillServiceTestCases',
test_name='cheets_CTS_Instant.arm.CtsAutoFillServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAutoFillServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAutoFillServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
index 03c6050..2365580 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsBackgroundRestrictionsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBackgroundRestrictionsTestCases',
test_name='cheets_CTS_Instant.arm.CtsBackgroundRestrictionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackgroundRestrictionsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
index b231af3..18e0614 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsCameraTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsCameraTestCases',
test_name='cheets_CTS_Instant.arm.CtsCameraTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsCameraTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
index 729f0c2..e4b5f04 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsColorModeTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsColorModeTestCases',
test_name='cheets_CTS_Instant.arm.CtsColorModeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsColorModeTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsColorModeTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsColorModeTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
index f646dea..ddca408 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDatabaseTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDatabaseTestCases',
test_name='cheets_CTS_Instant.arm.CtsDatabaseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDatabaseTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDatabaseTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
index 8524a44..def4c64 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDisplayTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDisplayTestCases',
test_name='cheets_CTS_Instant.arm.CtsDisplayTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDisplayTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDisplayTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
index 4bfdb51..e4cfce2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDpiTestCases',
test_name='cheets_CTS_Instant.arm.CtsDpiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDpiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDpiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases2
deleted file mode 100644
index 66b97d6..0000000
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDpiTestCases2
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.arm.CtsDpiTestCases2'
-ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module CtsDpiTestCases2 of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
-
-def run_CTS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_Instant',
- hosts=host_list,
- iterations=1,
- max_retry=3,
- needs_push_media=False,
- tag='arm.CtsDpiTestCases2',
- test_name='cheets_CTS_Instant.arm.CtsDpiTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
- target_module='CtsDpiTestCases2',
- target_plan=None,
- bundle='arm',
- warn_on_test_retry=False,
- retry_manual_tests=True,
- timeout=3600)
-
-parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
index 78c9119..b83ab90 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsDreamsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDreamsTestCases',
test_name='cheets_CTS_Instant.arm.CtsDreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDreamsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDreamsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
new file mode 100644
index 0000000..8d90c84
--- /dev/null
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsEdiHostTestCases
@@ -0,0 +1,36 @@
+# Copyright 2018 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.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_CTS_Instant.arm.CtsEdiHostTestCases'
+ATTRIBUTES = 'suite:cts_P'
+DEPENDENCIES = 'arc'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 512000
+DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
+
+def run_CTS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_CTS_Instant',
+ hosts=host_list,
+ iterations=1,
+ max_retry=3,
+ needs_push_media=False,
+ tag='arm.CtsEdiHostTestCases',
+ test_name='cheets_CTS_Instant.arm.CtsEdiHostTestCases',
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsEdiHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ target_module='CtsEdiHostTestCases',
+ target_plan=None,
+ bundle='arm',
+ warn_on_test_retry=False,
+ retry_manual_tests=True,
+ timeout=3600)
+
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
index dd76afa..472aace 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsExternalSourcesTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsExternalSourcesTestCases',
test_name='cheets_CTS_Instant.arm.CtsExternalSourcesTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalSourcesTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsExternalSourcesTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
index 525c64a..612de78 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFileSystemTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsFileSystemTestCases',
test_name='cheets_CTS_Instant.arm.CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsFileSystemTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFileSystemTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
index b0b028f..d7f6b40 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsFragmentTestCases',
test_name='cheets_CTS_Instant.arm.CtsFragmentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsFragmentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
index 5882730..b3c913b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsFragmentTestCasesSdk26
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsFragmentTestCasesSdk26',
test_name='cheets_CTS_Instant.arm.CtsFragmentTestCasesSdk26',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCasesSdk26', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCasesSdk26',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
index ee69723..b637bb1 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsGestureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsGestureTestCases',
test_name='cheets_CTS_Instant.arm.CtsGestureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsGestureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGestureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
index 35ac6d4..9b17827 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsHostsideWebViewTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHostsideWebViewTests',
test_name='cheets_CTS_Instant.arm.CtsHostsideWebViewTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideWebViewTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideWebViewTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
index f69e16b..c2ddd62 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodServiceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsInputMethodServiceHostTestCases',
test_name='cheets_CTS_Instant.arm.CtsInputMethodServiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsInputMethodServiceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodServiceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
index d855316..37d3514 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsInputMethodTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsInputMethodTestCases',
test_name='cheets_CTS_Instant.arm.CtsInputMethodTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsInputMethodTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsJobSchedulerTestCases
index caae1f8..5900947 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsJobSchedulerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJobSchedulerTestCases',
test_name='cheets_CTS_Instant.arm.CtsJobSchedulerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJobSchedulerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
index b88809c..8b751ba 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocation2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLocation2TestCases',
test_name='cheets_CTS_Instant.arm.CtsLocation2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsLocation2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocation2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
index 756707e..4e5c454 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsLocationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLocationTestCases',
test_name='cheets_CTS_Instant.arm.CtsLocationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsLocationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
index 68475b0..b4f0e87 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMediaHostTestCases',
test_name='cheets_CTS_Instant.arm.CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsMediaHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
index 9b2a06a..7748e02 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMediaTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsMediaTestCases',
test_name='cheets_CTS_Instant.arm.CtsMediaTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsMediaTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
index 0c2ff8e..3680e0b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsMultiUserTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMultiUserTestCases',
test_name='cheets_CTS_Instant.arm.CtsMultiUserTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsMultiUserTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMultiUserTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
index ab08a24..3d1bc47 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsOsHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOsHostTestCases',
test_name='cheets_CTS_Instant.arm.CtsOsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsOsHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOsHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
index 664eb5f..79d24e7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPdfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPdfTestCases',
test_name='cheets_CTS_Instant.arm.CtsPdfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPdfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPdfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPdfTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
index 5eed51f..8eb2bc5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermission2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPermission2TestCases',
test_name='cheets_CTS_Instant.arm.CtsPermission2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPermission2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermission2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
index 46a8936..5799b77 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPermissionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPermissionTestCases',
test_name='cheets_CTS_Instant.arm.CtsPermissionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPermissionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermissionTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
index c197f3c..ab6d1da 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreference2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPreference2TestCases',
test_name='cheets_CTS_Instant.arm.CtsPreference2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPreference2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreference2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
index c977798..393a150 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPreferenceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPreferenceTestCases',
test_name='cheets_CTS_Instant.arm.CtsPreferenceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreferenceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPreferenceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreferenceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
index 776dfee..9433735 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsPrintTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPrintTestCases',
test_name='cheets_CTS_Instant.arm.CtsPrintTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPrintTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPrintTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
index f18fb39..365ada5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSampleDeviceTestCases',
test_name='cheets_CTS_Instant.arm.CtsSampleDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsSampleDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
index 4c41c34..ea6441e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSampleHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSampleHostTestCases',
test_name='cheets_CTS_Instant.arm.CtsSampleHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsSampleHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
index 4d67dff..ba5255a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsSystemUiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSystemUiTestCases',
test_name='cheets_CTS_Instant.arm.CtsSystemUiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsSystemUiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemUiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
index 847ee37..609bac7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsTextTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTextTestCases',
test_name='cheets_CTS_Instant.arm.CtsTextTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsTextTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTextTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
index 2a3cb7b..25c06ec 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsToastTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsToastTestCases',
test_name='cheets_CTS_Instant.arm.CtsToastTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsToastTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsToastTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
index 524a62e..f227c3b 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiAutomationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUiAutomationTestCases',
test_name='cheets_CTS_Instant.arm.CtsUiAutomationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUiAutomationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiAutomationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
index 095b611..e099061 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUiDeviceTestCases',
test_name='cheets_CTS_Instant.arm.CtsUiDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUiDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiHostTestCases
deleted file mode 100644
index 87352bd..0000000
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUiHostTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.arm.CtsUiHostTestCases'
-ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module CtsUiHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using arm ABI in the ARC++ container.'
-
-def run_CTS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_Instant',
- hosts=host_list,
- iterations=1,
- max_retry=3,
- needs_push_media=False,
- tag='arm.CtsUiHostTestCases',
- test_name='cheets_CTS_Instant.arm.CtsUiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
- target_module='CtsUiHostTestCases',
- target_plan=None,
- bundle='arm',
- warn_on_test_retry=False,
- retry_manual_tests=True,
- timeout=3600)
-
-parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
index 9aec0b5..b0b8fc2 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUidIsolationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUidIsolationTestCases',
test_name='cheets_CTS_Instant.arm.CtsUidIsolationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUidIsolationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
index 3fb6b1b..1524c75 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsageStatsTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsUsageStatsTestCases',
test_name='cheets_CTS_Instant.arm.CtsUsageStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
index 080aa23..faa41b5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsUsbTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUsbTests',
test_name='cheets_CTS_Instant.arm.CtsUsbTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUsbTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsbTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
index 229d52c..502b97c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsViewTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsViewTestCases',
test_name='cheets_CTS_Instant.arm.CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsViewTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
index 5b3c3db..fcc9a97 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWidgetTestCases',
test_name='cheets_CTS_Instant.arm.CtsWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWidgetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
index f6b1e7d..aa9669c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.arm.CtsWindowManagerDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWindowManagerDeviceTestCases',
test_name='cheets_CTS_Instant.arm.CtsWindowManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWindowManagerDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
index ef55515..4ac8937 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccessibilityServiceTestCases',
test_name='cheets_CTS_Instant.x86.CtsAccessibilityServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
index 288aaeb..5e3630d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccessibilityTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccessibilityTestCases',
test_name='cheets_CTS_Instant.x86.CtsAccessibilityTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
index c4a0b80..0d4247c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAccountManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccountManagerTestCases',
test_name='cheets_CTS_Instant.x86.CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccountManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
index 86a79f0..19c85ba 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAnimationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAnimationTestCases',
test_name='cheets_CTS_Instant.x86.CtsAnimationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAnimationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAnimationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
index 479601b..c032fe3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppSecurityHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppSecurityHostTestCases',
test_name='cheets_CTS_Instant.x86.CtsAppSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAppSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppSecurityHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
index 0b99ac0..adec23f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAppWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppWidgetTestCases',
test_name='cheets_CTS_Instant.x86.CtsAppWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAppWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppWidgetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
index 391a9e4..efe2499 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsAutoFillServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAutoFillServiceTestCases',
test_name='cheets_CTS_Instant.x86.CtsAutoFillServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAutoFillServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAutoFillServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
index d089a42..62e76a7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsBackgroundRestrictionsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBackgroundRestrictionsTestCases',
test_name='cheets_CTS_Instant.x86.CtsBackgroundRestrictionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackgroundRestrictionsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
index 8748d62..f4fdf29 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsCameraTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsCameraTestCases',
test_name='cheets_CTS_Instant.x86.CtsCameraTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsCameraTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
index 420d59b..dc4014f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsColorModeTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsColorModeTestCases',
test_name='cheets_CTS_Instant.x86.CtsColorModeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsColorModeTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsColorModeTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsColorModeTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
index 28bac89..7694bd3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDatabaseTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDatabaseTestCases',
test_name='cheets_CTS_Instant.x86.CtsDatabaseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDatabaseTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDatabaseTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
index b5ee056..391423d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDisplayTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDisplayTestCases',
test_name='cheets_CTS_Instant.x86.CtsDisplayTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDisplayTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDisplayTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
index d264fd7..4439ed1 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDpiTestCases',
test_name='cheets_CTS_Instant.x86.CtsDpiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDpiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDpiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases2
deleted file mode 100644
index d48738b..0000000
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDpiTestCases2
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.x86.CtsDpiTestCases2'
-ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module CtsDpiTestCases2 of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
-
-def run_CTS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_Instant',
- hosts=host_list,
- iterations=1,
- max_retry=3,
- needs_push_media=False,
- tag='x86.CtsDpiTestCases2',
- test_name='cheets_CTS_Instant.x86.CtsDpiTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
- target_module='CtsDpiTestCases2',
- target_plan=None,
- bundle='x86',
- warn_on_test_retry=False,
- retry_manual_tests=True,
- timeout=3600)
-
-parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
index 1574494..ed70250 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsDreamsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDreamsTestCases',
test_name='cheets_CTS_Instant.x86.CtsDreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsDreamsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDreamsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
new file mode 100644
index 0000000..90f1495
--- /dev/null
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsEdiHostTestCases
@@ -0,0 +1,36 @@
+# Copyright 2018 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.
+
+# This file has been automatically generated. Do not edit!
+
+AUTHOR = 'ARC++ Team'
+NAME = 'cheets_CTS_Instant.x86.CtsEdiHostTestCases'
+ATTRIBUTES = 'suite:cts_P'
+DEPENDENCIES = 'arc, cts_abi_x86'
+JOB_RETRIES = 1
+TEST_TYPE = 'server'
+TIME = 'MEDIUM'
+MAX_RESULT_SIZE_KB = 512000
+DOC = 'Run module CtsEdiHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
+
+def run_CTS(machine):
+ host_list = [hosts.create_host(machine)]
+ job.run_test(
+ 'cheets_CTS_Instant',
+ hosts=host_list,
+ iterations=1,
+ max_retry=3,
+ needs_push_media=False,
+ tag='x86.CtsEdiHostTestCases',
+ test_name='cheets_CTS_Instant.x86.CtsEdiHostTestCases',
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsEdiHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
+ target_module='CtsEdiHostTestCases',
+ target_plan=None,
+ bundle='x86',
+ warn_on_test_retry=False,
+ retry_manual_tests=True,
+ timeout=3600)
+
+parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
index 952d3af..3603659 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsExternalSourcesTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsExternalSourcesTestCases',
test_name='cheets_CTS_Instant.x86.CtsExternalSourcesTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalSourcesTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsExternalSourcesTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
index f36c773..b55ea77 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFileSystemTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsFileSystemTestCases',
test_name='cheets_CTS_Instant.x86.CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsFileSystemTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFileSystemTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
index 4af29b3..ceb9ce7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsFragmentTestCases',
test_name='cheets_CTS_Instant.x86.CtsFragmentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsFragmentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
index 8da6c5f..1237559 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsFragmentTestCasesSdk26
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsFragmentTestCasesSdk26',
test_name='cheets_CTS_Instant.x86.CtsFragmentTestCasesSdk26',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCasesSdk26', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCasesSdk26',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
index 4365f7f..b5e343e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsGestureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsGestureTestCases',
test_name='cheets_CTS_Instant.x86.CtsGestureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsGestureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGestureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
index d7ae145..f8a4fc5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsHostsideWebViewTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHostsideWebViewTests',
test_name='cheets_CTS_Instant.x86.CtsHostsideWebViewTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideWebViewTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideWebViewTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
index af4d7af..1d4f8ca 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodServiceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsInputMethodServiceHostTestCases',
test_name='cheets_CTS_Instant.x86.CtsInputMethodServiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsInputMethodServiceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodServiceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
index e13ab24..af8282d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsInputMethodTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsInputMethodTestCases',
test_name='cheets_CTS_Instant.x86.CtsInputMethodTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsInputMethodTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsJobSchedulerTestCases
index 838c79d..f066c9f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsJobSchedulerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJobSchedulerTestCases',
test_name='cheets_CTS_Instant.x86.CtsJobSchedulerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJobSchedulerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
index dfbee29..33a3b9f 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocation2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLocation2TestCases',
test_name='cheets_CTS_Instant.x86.CtsLocation2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsLocation2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocation2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
index d5f6bce..ca3fb2c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsLocationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLocationTestCases',
test_name='cheets_CTS_Instant.x86.CtsLocationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsLocationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
index 87b29d1..27bc4ad 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMediaHostTestCases',
test_name='cheets_CTS_Instant.x86.CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsMediaHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
index 038835b..b15beeb 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMediaTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsMediaTestCases',
test_name='cheets_CTS_Instant.x86.CtsMediaTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsMediaTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
index 422b5a4..6670df4 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsMultiUserTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMultiUserTestCases',
test_name='cheets_CTS_Instant.x86.CtsMultiUserTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsMultiUserTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMultiUserTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
index f175c88..301f407 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsOsHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOsHostTestCases',
test_name='cheets_CTS_Instant.x86.CtsOsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsOsHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOsHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
index 560c4b1..b2232c6 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPdfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPdfTestCases',
test_name='cheets_CTS_Instant.x86.CtsPdfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPdfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPdfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPdfTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
index 283c3d0..d8d780e 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermission2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPermission2TestCases',
test_name='cheets_CTS_Instant.x86.CtsPermission2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPermission2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermission2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
index b21012d..d5ad86d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPermissionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPermissionTestCases',
test_name='cheets_CTS_Instant.x86.CtsPermissionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPermissionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermissionTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
index c2335a5..14b78f6 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreference2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPreference2TestCases',
test_name='cheets_CTS_Instant.x86.CtsPreference2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPreference2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreference2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
index 29ea6fd..0cd3773 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPreferenceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPreferenceTestCases',
test_name='cheets_CTS_Instant.x86.CtsPreferenceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreferenceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPreferenceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreferenceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
index 85f4213..c2a70d5 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsPrintTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPrintTestCases',
test_name='cheets_CTS_Instant.x86.CtsPrintTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsPrintTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPrintTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
index ff0a47d..7c2bed7 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSampleDeviceTestCases',
test_name='cheets_CTS_Instant.x86.CtsSampleDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsSampleDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
index 02a5af6..0a7b2d3 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSampleHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSampleHostTestCases',
test_name='cheets_CTS_Instant.x86.CtsSampleHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsSampleHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
index 96a8ba5..88664cf 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsSystemUiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSystemUiTestCases',
test_name='cheets_CTS_Instant.x86.CtsSystemUiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsSystemUiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemUiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
index df37561..f211d07 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsTextTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTextTestCases',
test_name='cheets_CTS_Instant.x86.CtsTextTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsTextTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTextTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
index a857c5e..77f30fc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsToastTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsToastTestCases',
test_name='cheets_CTS_Instant.x86.CtsToastTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsToastTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsToastTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
index 8dadf86..dfd2723 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiAutomationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUiAutomationTestCases',
test_name='cheets_CTS_Instant.x86.CtsUiAutomationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUiAutomationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiAutomationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
index ae3fca1..9294edc 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUiDeviceTestCases',
test_name='cheets_CTS_Instant.x86.CtsUiDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUiDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiHostTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiHostTestCases
deleted file mode 100644
index 78b4417..0000000
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUiHostTestCases
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2018 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.
-
-# This file has been automatically generated. Do not edit!
-
-AUTHOR = 'ARC++ Team'
-NAME = 'cheets_CTS_Instant.x86.CtsUiHostTestCases'
-ATTRIBUTES = 'suite:cts_P'
-DEPENDENCIES = 'arc, cts_abi_x86'
-JOB_RETRIES = 1
-TEST_TYPE = 'server'
-TIME = 'MEDIUM'
-MAX_RESULT_SIZE_KB = 512000
-DOC = 'Run module CtsUiHostTestCases of the Android Compatibility Test Suite for Instant Apps (CTS Instant) using x86 ABI in the ARC++ container.'
-
-def run_CTS(machine):
- host_list = [hosts.create_host(machine)]
- job.run_test(
- 'cheets_CTS_Instant',
- hosts=host_list,
- iterations=1,
- max_retry=3,
- needs_push_media=False,
- tag='x86.CtsUiHostTestCases',
- test_name='cheets_CTS_Instant.x86.CtsUiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
- target_module='CtsUiHostTestCases',
- target_plan=None,
- bundle='x86',
- warn_on_test_retry=False,
- retry_manual_tests=True,
- timeout=3600)
-
-parallel_simple(run_CTS, machines)
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
index feeabd3..f5b1267 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUidIsolationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUidIsolationTestCases',
test_name='cheets_CTS_Instant.x86.CtsUidIsolationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUidIsolationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
index 22352ef..0d59b92 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsageStatsTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsUsageStatsTestCases',
test_name='cheets_CTS_Instant.x86.CtsUsageStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
index da4208b..b914bab 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsUsbTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUsbTests',
test_name='cheets_CTS_Instant.x86.CtsUsbTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsUsbTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsbTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
index 14a7a40..df0721d 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsViewTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsViewTestCases',
test_name='cheets_CTS_Instant.x86.CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsViewTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
index a7bb85c..dab1d5c 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWidgetTestCases',
test_name='cheets_CTS_Instant.x86.CtsWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWidgetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
index 691aa36..fe90f6a 100644
--- a/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_Instant/control.x86.CtsWindowManagerDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWindowManagerDeviceTestCases',
test_name='cheets_CTS_Instant.x86.CtsWindowManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts-instant', '-m', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWindowManagerDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases
index 9719545..8de7dac 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAbiOverrideHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAbiOverrideHostTestCases',
test_name='cheets_CTS_P.arm.CtsAbiOverrideHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAbiOverrideHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases
index 047faeb..d79203f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccelerationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccelerationTestCases',
test_name='cheets_CTS_P.arm.CtsAccelerationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccelerationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccelerationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases
index 4421d68..7db8ea6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccessibilityServiceTestCases',
test_name='cheets_CTS_P.arm.CtsAccessibilityServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases
index 15c7520..59e0976 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccessibilityTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccessibilityTestCases',
test_name='cheets_CTS_P.arm.CtsAccessibilityTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases
index 218a41f..e81a1a2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAccountManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAccountManagerTestCases',
test_name='cheets_CTS_P.arm.CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccountManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases
index c307a70..4d1310f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceSdk25TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsActivityManagerDeviceSdk25TestCases',
test_name='cheets_CTS_P.arm.CtsActivityManagerDeviceSdk25TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsActivityManagerDeviceSdk25TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
index 570ad1e..bc7336b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsActivityManagerDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsActivityManagerDeviceTestCases',
test_name='cheets_CTS_P.arm.CtsActivityManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsActivityManagerDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases
index dba24f5..97e2b02 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminPackageInstallerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAdminPackageInstallerTestCases',
test_name='cheets_CTS_P.arm.CtsAdminPackageInstallerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAdminPackageInstallerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases
index 9230582..63b4566 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAdminTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAdminTestCases',
test_name='cheets_CTS_P.arm.CtsAdminTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAdminTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases
index d0ed879..8a4267a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmClockTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAlarmClockTestCases',
test_name='cheets_CTS_P.arm.CtsAlarmClockTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAlarmClockTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases
index 10a54f3..8c77762 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAlarmManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAlarmManagerTestCases',
test_name='cheets_CTS_P.arm.CtsAlarmManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAlarmManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases
index 96939a0..79c51e5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidAppTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAndroidAppTestCases',
test_name='cheets_CTS_P.arm.CtsAndroidAppTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidAppTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases
index a33ab1b..bbba07a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestBase27ApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAndroidTestBase27ApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsAndroidTestBase27ApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidTestBase27ApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases
index 53d5c02..289b4cc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestMockCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAndroidTestMockCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsAndroidTestMockCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidTestMockCurrentApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases
index a7b2a33..974b24d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsAndroidTestRunnerCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidTestRunnerCurrentApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases
index 7ccb4f9..fc72ef6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAnimationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAnimationTestCases',
test_name='cheets_CTS_P.arm.CtsAnimationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAnimationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases
index 7476fc3..7fda5e2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacy27ApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsApacheHttpLegacy27ApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsApacheHttpLegacy27ApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsApacheHttpLegacy27ApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases
index 3ed6669..c69f2b7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsApacheHttpLegacyCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsApacheHttpLegacyCurrentApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
index d4f79c2..c756831 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases
index a78285d..c53cd89 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppComponentFactoryTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppComponentFactoryTestCases',
test_name='cheets_CTS_P.arm.CtsAppComponentFactoryTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppComponentFactoryTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases
index c6dcb8b..71840c7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppSecurityHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppSecurityHostTestCases',
test_name='cheets_CTS_P.arm.CtsAppSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppSecurityHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases
index fbec480..b487822 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppTestCases',
test_name='cheets_CTS_P.arm.CtsAppTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases
index c21398f..5bedeef 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppUsageHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppUsageHostTestCases',
test_name='cheets_CTS_P.arm.CtsAppUsageHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppUsageHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppUsageHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppUsageHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases
index 4fdf0c1..7469394 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAppWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAppWidgetTestCases',
test_name='cheets_CTS_P.arm.CtsAppWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppWidgetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases
index 4d0e781..ad7bbda 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAslrMallocTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAslrMallocTestCases',
test_name='cheets_CTS_P.arm.CtsAslrMallocTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAslrMallocTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAslrMallocTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAslrMallocTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases
index f82470a..5964d68 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAssistTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAssistTestCases',
test_name='cheets_CTS_P.arm.CtsAssistTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAssistTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAssistTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAssistTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases
index 8c7a602..3fb3de7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAtraceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAtraceHostTestCases',
test_name='cheets_CTS_P.arm.CtsAtraceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAtraceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAtraceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAtraceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases
index 6321e6e..093dd4f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsAutoFillServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsAutoFillServiceTestCases',
test_name='cheets_CTS_P.arm.CtsAutoFillServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAutoFillServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAutoFillServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases
index 365e351..7f24bf3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBackgroundRestrictionsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBackgroundRestrictionsTestCases',
test_name='cheets_CTS_P.arm.CtsBackgroundRestrictionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackgroundRestrictionsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases
index be8b34a..86625f2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBackupHostTestCases',
test_name='cheets_CTS_P.arm.CtsBackupHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackupHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases
index c4d1679..f6e9b8b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBackupTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBackupTestCases',
test_name='cheets_CTS_P.arm.CtsBackupTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackupTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases
index dad057b..9ee1e63 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBatterySavingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBatterySavingTestCases',
test_name='cheets_CTS_P.arm.CtsBatterySavingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBatterySavingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBatterySavingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBatterySavingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases
index 991c853..ad45e4f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBionicTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBionicTestCases',
test_name='cheets_CTS_P.arm.CtsBionicTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBionicTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBionicTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBionicTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases
index 4d3da95..71a77ca 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBluetoothTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBluetoothTestCases',
test_name='cheets_CTS_P.arm.CtsBluetoothTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBluetoothTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBluetoothTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBluetoothTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases
index a3e8c81..1c54aa3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsBootStatsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsBootStatsTestCases',
test_name='cheets_CTS_P.arm.CtsBootStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBootStatsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBootStatsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBootStatsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases
index 245453a..baa7dce 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCalendarcommon2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCalendarcommon2TestCases',
test_name='cheets_CTS_P.arm.CtsCalendarcommon2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCalendarcommon2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCalendarcommon2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCalendarcommon2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases
index 6a05f30..fa55dfc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraApi25TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCameraApi25TestCases',
test_name='cheets_CTS_P.arm.CtsCameraApi25TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraApi25TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
index e7ed89e..068db94 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCameraTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsCameraTestCases',
test_name='cheets_CTS_P.arm.CtsCameraTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases
index d3db0a2..33aab18 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCarTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCarTestCases',
test_name='cheets_CTS_P.arm.CtsCarTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCarTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases
index df898b8..8a373f7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCarrierApiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCarrierApiTestCases',
test_name='cheets_CTS_P.arm.CtsCarrierApiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarrierApiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarrierApiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCarrierApiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases
index 5cc28eb..99843a8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsColorModeTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsColorModeTestCases',
test_name='cheets_CTS_P.arm.CtsColorModeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsColorModeTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsColorModeTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsColorModeTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases
index 8b09c7a..ad6f69f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCompilationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCompilationTestCases',
test_name='cheets_CTS_P.arm.CtsCompilationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCompilationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCompilationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCompilationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe
index 30d57f4..4c58e12 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsContactsProviderWipe
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsContactsProviderWipe',
test_name='cheets_CTS_P.arm.CtsContactsProviderWipe',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContactsProviderWipe', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContactsProviderWipe', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsContactsProviderWipe',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases
index 5fa7243..7468408 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsContentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsContentTestCases',
test_name='cheets_CTS_P.arm.CtsContentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsContentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases
index 6b1d0d2..26670bf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCppToolsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCppToolsTestCases',
test_name='cheets_CTS_P.arm.CtsCppToolsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCppToolsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCppToolsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCppToolsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases
index f287221..07ba675 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCurrentApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases
index 040eda6..c22ebfc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDatabaseTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDatabaseTestCases',
test_name='cheets_CTS_P.arm.CtsDatabaseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDatabaseTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases
index 5df8ecf..0b9f52d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDebugTestCases',
test_name='cheets_CTS_P.arm.CtsDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDebugTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
index 151ca37..3815e05 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeqpTestCases
@@ -28,8 +28,8 @@
needs_push_media=False,
tag='arm.CtsDeqpTestCases',
test_name='cheets_CTS_P.arm.CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases
index fcf0e40..edcb208 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDeviceIdleHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDeviceIdleHostTestCases',
test_name='cheets_CTS_P.arm.CtsDeviceIdleHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeviceIdleHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases
index d0d502f..a41737d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDevicePolicyManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDevicePolicyManagerTestCases',
test_name='cheets_CTS_P.arm.CtsDevicePolicyManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDevicePolicyManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases
index afda288..f6bdbe0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDexMetadataHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDexMetadataHostTestCases',
test_name='cheets_CTS_P.arm.CtsDexMetadataHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDexMetadataHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDexMetadataHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDexMetadataHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases
index e62a934..e1d0ae3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDisplayTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDisplayTestCases',
test_name='cheets_CTS_P.arm.CtsDisplayTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDisplayTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases
index 931d862..efacf9b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDpiTestCases',
test_name='cheets_CTS_P.arm.CtsDpiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDpiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2
index 09a96f2..662bd73 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDpiTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDpiTestCases2',
test_name='cheets_CTS_P.arm.CtsDpiTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDpiTestCases2',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases
index 37b7fad..44550d1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDreamsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDreamsTestCases',
test_name='cheets_CTS_P.arm.CtsDreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDreamsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases
index baa9577..12024f3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDrmTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDrmTestCases',
test_name='cheets_CTS_P.arm.CtsDrmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDrmTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDrmTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDrmTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases
index 9ec9484..af68a41 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDumpsysHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDumpsysHostTestCases',
test_name='cheets_CTS_P.arm.CtsDumpsysHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDumpsysHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDumpsysHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDumpsysHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases
index 1cc7ae7..b7f2e60 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsDynamicLinkerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsDynamicLinkerTestCases',
test_name='cheets_CTS_P.arm.CtsDynamicLinkerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDynamicLinkerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDynamicLinkerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDynamicLinkerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases
index fbe86f4..aa5948e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsEdiHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsEdiHostTestCases',
test_name='cheets_CTS_P.arm.CtsEdiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEdiHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEdiHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsEdiHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases
index 8c523c6..2cf59e7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsEffectTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsEffectTestCases',
test_name='cheets_CTS_P.arm.CtsEffectTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEffectTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEffectTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsEffectTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases
index bbedcc9..e7cedd7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsExternalServiceTestCases',
test_name='cheets_CTS_P.arm.CtsExternalServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsExternalServiceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases
index cd760bb..97e2f92 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsExternalSourcesTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsExternalSourcesTestCases',
test_name='cheets_CTS_P.arm.CtsExternalSourcesTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalSourcesTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsExternalSourcesTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases
index 6aa83a0..93106e6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsFileSystemTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsFileSystemTestCases',
test_name='cheets_CTS_P.arm.CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFileSystemTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases
index f4eaa07..c4e639a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsFragmentTestCases',
test_name='cheets_CTS_P.arm.CtsFragmentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26
index 713cec3..5da1f11 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsFragmentTestCasesSdk26
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsFragmentTestCasesSdk26',
test_name='cheets_CTS_P.arm.CtsFragmentTestCasesSdk26',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCasesSdk26', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCasesSdk26',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases
index 8f0b20c..3b154af 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsGestureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsGestureTestCases',
test_name='cheets_CTS_P.arm.CtsGestureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGestureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases
index bbfa3a5..71af50c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsGpuToolsHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsGpuToolsHostTestCases',
test_name='cheets_CTS_P.arm.CtsGpuToolsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGpuToolsHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGpuToolsHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGpuToolsHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases
index a34eb0f..9d8c683 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsGraphicsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsGraphicsTestCases',
test_name='cheets_CTS_P.arm.CtsGraphicsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGraphicsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGraphicsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGraphicsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases
index 22fe4f4..2ca06a5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHardwareTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHardwareTestCases',
test_name='cheets_CTS_P.arm.CtsHardwareTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHardwareTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHardwareTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHardwareTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases
index acaebda..f7e494e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHarmfulAppWarningHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHarmfulAppWarningHostTestCases',
test_name='cheets_CTS_P.arm.CtsHarmfulAppWarningHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHarmfulAppWarningHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases
index afcb609..50d9bd6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistApi27TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHiddenApiBlacklistApi27TestCases',
test_name='cheets_CTS_P.arm.CtsHiddenApiBlacklistApi27TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiBlacklistApi27TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases
index d03bc99..157d53e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistCurrentApiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHiddenApiBlacklistCurrentApiTestCases',
test_name='cheets_CTS_P.arm.CtsHiddenApiBlacklistCurrentApiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiBlacklistCurrentApiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases
index 7066f0c..8330d73 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiBlacklistDebugClassTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHiddenApiBlacklistDebugClassTestCases',
test_name='cheets_CTS_P.arm.CtsHiddenApiBlacklistDebugClassTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiBlacklistDebugClassTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases
index 763ad19..7b9e554 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchDebugClassTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHiddenApiKillswitchDebugClassTestCases',
test_name='cheets_CTS_P.arm.CtsHiddenApiKillswitchDebugClassTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiKillswitchDebugClassTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases
index 515e33b..95d647c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWhitelistTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHiddenApiKillswitchWhitelistTestCases',
test_name='cheets_CTS_P.arm.CtsHiddenApiKillswitchWhitelistTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiKillswitchWhitelistTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases
index a3658df..aa0fb48 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHiddenApiKillswitchWildcardTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHiddenApiKillswitchWildcardTestCases',
test_name='cheets_CTS_P.arm.CtsHiddenApiKillswitchWildcardTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiKillswitchWildcardTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests
index a73beb5..65f8af7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostTzDataTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHostTzDataTests',
test_name='cheets_CTS_P.arm.CtsHostTzDataTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostTzDataTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostTzDataTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostTzDataTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests
index edcc3ea..659d726 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNetworkTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHostsideNetworkTests',
test_name='cheets_CTS_P.arm.CtsHostsideNetworkTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideNetworkTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases
index 8268a32..8251ee3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideNumberBlockingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHostsideNumberBlockingTestCases',
test_name='cheets_CTS_P.arm.CtsHostsideNumberBlockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideNumberBlockingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests
index ef98524..bfcce3d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideTvTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHostsideTvTests',
test_name='cheets_CTS_P.arm.CtsHostsideTvTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideTvTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideTvTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideTvTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests
index 04d3cf7..3541edd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsHostsideWebViewTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsHostsideWebViewTests',
test_name='cheets_CTS_P.arm.CtsHostsideWebViewTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideWebViewTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideWebViewTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases
index 875d4cd..2ee0ae8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsIcuTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsIcuTestCases',
test_name='cheets_CTS_P.arm.CtsIcuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIcuTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIcuTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsIcuTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases
index f4b1444..8606310 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsIncidentHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsIncidentHostTestCases',
test_name='cheets_CTS_P.arm.CtsIncidentHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIncidentHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIncidentHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsIncidentHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases
index 2d12a9a..2951d3c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsInlineMockingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsInlineMockingTestCases',
test_name='cheets_CTS_P.arm.CtsInlineMockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInlineMockingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInlineMockingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInlineMockingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases
index a2fa359..b0cd080 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodServiceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsInputMethodServiceHostTestCases',
test_name='cheets_CTS_P.arm.CtsInputMethodServiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodServiceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases
index 32518a0..4d7c6a9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsInputMethodTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsInputMethodTestCases',
test_name='cheets_CTS_P.arm.CtsInputMethodTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases
index c09f935..40b82ba 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsIntentSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsIntentSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsIntentSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIntentSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsIntentSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases
index 6caadf2..66dd69c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJankDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJankDeviceTestCases',
test_name='cheets_CTS_P.arm.CtsJankDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJankDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJankDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJankDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases
index e631c3b..4a7e651 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpSecurityHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJdwpSecurityHostTestCases',
test_name='cheets_CTS_P.arm.CtsJdwpSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJdwpSecurityHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases
index ad04ac6..3521c94 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJdwpTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJdwpTestCases',
test_name='cheets_CTS_P.arm.CtsJdwpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJdwpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases
index 4d0c17c..3092e20 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJniTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJniTestCases',
test_name='cheets_CTS_P.arm.CtsJniTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJniTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJniTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJniTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases
index 7bff068..95a431b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerSharedUidTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJobSchedulerSharedUidTestCases',
test_name='cheets_CTS_P.arm.CtsJobSchedulerSharedUidTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJobSchedulerSharedUidTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases
index 2adaa12..dbfea20 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJobSchedulerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJobSchedulerTestCases',
test_name='cheets_CTS_P.arm.CtsJobSchedulerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJobSchedulerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases
index 219d153..78a33f9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiAttachingHostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiAttachingHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiAttachingHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases
index d6eb4c3..773ff43 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiAttachingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiAttachingTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiAttachingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiAttachingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases
index bcf157a..ec550ff 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRedefineClassesHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRedefineClassesHostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRedefineClassesHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRedefineClassesHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases
index cb67213..da5c98e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1900HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1900HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1900HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1900HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases
index 5f58b66..1024e9c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1901HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1901HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1901HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1901HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases
index 1d33596..c5bc330 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1902HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1902HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1902HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1902HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases
index 61918b4..e6bf2f8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1903HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1903HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1903HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1903HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases
index 316030a..712ec21 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1904HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1904HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1904HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1904HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases
index bd975cc..902ac05 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1906HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1906HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1906HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1906HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases
index ca11fce..09560ce 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1907HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1907HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1907HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1907HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases
index 7c757b9..8d4c4d7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1908HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1908HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1908HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1908HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases
index d31fb8d..bf4e260 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1909HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1909HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1909HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1909HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases
index 0a0669f..77bd9f4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1910HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1910HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1910HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1910HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases
index a71d5c8..1c95715 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1911HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1911HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1911HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1911HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases
index 3b4f864..b13e73b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1912HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1912HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1912HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1912HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases
index c850f99..735d88c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1913HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1913HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1913HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1913HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases
index fa7f6ad..b7422de 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1914HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1914HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1914HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1914HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases
index a64aeae..8d3d945 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1915HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1915HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1915HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1915HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases
index 5f625d1..727af06 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1916HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1916HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1916HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1916HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases
index ba8eafb..8d58130 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1917HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1917HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1917HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1917HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases
index b82ba44..f969396 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1920HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1920HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1920HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1920HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases
index 76a319b..9b6724d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1921HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1921HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1921HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1921HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases
index 6ef1213..60a17ad 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1922HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1922HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1922HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1922HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases
index c72963b..a3562de 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1923HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1923HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1923HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1923HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases
index b973fd8..33902c3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1924HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1924HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1924HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1924HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases
index 55cb5bb..074937d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1925HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1925HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1925HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1925HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases
index 31509ab..88cd929 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1926HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1926HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1926HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1926HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases
index 3c29a1f..ddb8c8a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1927HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1927HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1927HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1927HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases
index c3f8d99..994bde1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1928HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1928HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1928HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1928HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases
index a815601..26f749c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1930HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1930HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1930HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1930HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases
index 2b19266..62efccc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1931HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1931HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1931HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1931HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases
index 8c2a836..c0c22e2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1932HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1932HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1932HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1932HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases
index 84e594a..b5dbdb4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1933HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1933HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1933HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1933HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases
index 5d742a1..fa4ea25 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1934HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1934HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1934HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1934HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases
index 52580f6..48915a5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1936HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1936HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1936HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1936HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases
index 2bebf9b..77709de 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1937HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1937HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1937HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1937HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases
index fa60bf4..b25d7fa 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1939HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1939HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1939HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1939HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases
index 0f04bc6..8903a79 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1941HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1941HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1941HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1941HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases
index 8b1c863..dc953c7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1942HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1942HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1942HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1942HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases
index 43a4b98..3ed8c33 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest1943HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest1943HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest1943HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1943HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases
index 44ce1b2..d3d851b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest902HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest902HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest902HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest902HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases
index 3e4a17c..f086a84 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest903HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest903HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest903HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest903HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases
index ad0cf81..d6a3580 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest904HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest904HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest904HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest904HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases
index 2dc33b9..3086911 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest905HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest905HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest905HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest905HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases
index be03caa..709913f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest906HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest906HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest906HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest906HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases
index 0e1a5e4..92f8c9d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest907HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest907HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest907HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest907HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases
index 5011194..84c26cf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest908HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest908HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest908HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest908HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases
index 6c93bb1..defed50 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest910HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest910HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest910HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest910HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases
index c6ee0f3..00f3316 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest911HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest911HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest911HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest911HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases
index 0396a6a..57254cd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest912HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest912HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest912HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest912HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases
index 8870600..c3d7f29 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest913HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest913HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest913HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest913HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases
index ab5dc08..18eb554 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest914HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest914HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest914HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest914HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases
index bae50d3..3fc5f09 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest915HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest915HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest915HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest915HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases
index 3c99d2c..b465e62 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest917HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest917HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest917HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest917HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases
index 19d87ce..947928a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest918HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest918HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest918HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest918HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases
index 5b223e0..b7e94a2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest919HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest919HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest919HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest919HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases
index cb16dcb..70dc199 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest920HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest920HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest920HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest920HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases
index 4c1f294..9e436a8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest922HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest922HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest922HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest922HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases
index f340a74..d8bf41d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest923HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest923HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest923HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest923HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases
index 4ba72ca..c2c7929 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest924HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest924HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest924HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest924HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases
index 56541e4..29b1255 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest926HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest926HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest926HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest926HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases
index 634903e..6117569 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest927HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest927HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest927HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest927HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases
index 5c09819..368c064 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest928HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest928HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest928HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest928HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases
index f438c54..bc6ee95 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest930HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest930HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest930HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest930HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases
index f4d1485..3025c68 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest931HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest931HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest931HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest931HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases
index f9fbae4..1b49798 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest932HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest932HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest932HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest932HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases
index 965b28c..3b26c01 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest940HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest940HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest940HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest940HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases
index 8476555..b91f813 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest942HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest942HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest942HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest942HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases
index 6c9e85d..e5c5ae9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest944HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest944HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest944HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest944HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases
index 7dd36da..f0584f9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest945HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest945HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest945HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest945HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases
index 43202cc..4d2dddd 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest947HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest947HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest947HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest947HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases
index 47564f6..f538c75 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest951HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest951HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest951HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest951HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases
index e990e6a..6743bc7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest982HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest982HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest982HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest982HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases
index 5c86d0d..5797e76 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest983HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest983HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest983HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest983HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases
index 022f797..fbece14 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest984HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest984HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest984HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest984HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases
index 05cdfb2..80ca260 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest985HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest985HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest985HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest985HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases
index 17249a1..b67c0d9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest986HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest986HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest986HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest986HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases
index 7c758d3..d5d3354 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest988HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest988HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest988HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest988HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases
index fe97c1c..1aaa728 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest989HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest989HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest989HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest989HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases
index 1087ac0..d4b8624 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest990HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest990HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest990HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest990HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases
index 6b883bf..94ed7e4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest991HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest991HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest991HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest991HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases
index a7e5dd7..fc3d28c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest992HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest992HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest992HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest992HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases
index a4d1f0f..ec05536 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest993HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest993HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest993HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest993HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases
index dfc27e3..353ee83 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest994HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest994HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest994HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest994HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases
index 5e31130..97d5a70 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest995HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest995HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest995HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest995HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases
index 54927f5..a380684 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest996HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest996HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest996HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest996HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases
index f1e0750..e73016e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiRunTest997HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiRunTest997HostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiRunTest997HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest997HostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases
index c09c2f2..95a434b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTaggingHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiTaggingHostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiTaggingHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiTaggingHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases
index 345a053..c3bfb5d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsJvmtiTrackingHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsJvmtiTrackingHostTestCases',
test_name='cheets_CTS_P.arm.CtsJvmtiTrackingHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiTrackingHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases
index 12fe08a..da91b27 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsKernelConfigTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsKernelConfigTestCases',
test_name='cheets_CTS_P.arm.CtsKernelConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKernelConfigTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKernelConfigTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsKernelConfigTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases
index 9b94f1d..9b12761 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsKeystoreTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsKeystoreTestCases',
test_name='cheets_CTS_P.arm.CtsKeystoreTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKeystoreTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKeystoreTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsKeystoreTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases
index b1cc02a..28aca79 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLeanbackJankTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLeanbackJankTestCases',
test_name='cheets_CTS_P.arm.CtsLeanbackJankTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLeanbackJankTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLeanbackJankTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLeanbackJankTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases
index 1c2e9bb..4b2bed0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreFileIOTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreFileIOTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreFileIOTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreFileIOTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJavaUtilCollectionsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJavaUtilCollectionsTestCases
index 4875563..a2dc785 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJavaUtilCollectionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJavaUtilCollectionsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreJavaUtilCollectionsTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreJavaUtilCollectionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJavaUtilCollectionsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJavaUtilCollectionsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreJavaUtilCollectionsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases
index 7d07b91..23768f6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreJsr166TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreJsr166TestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreJsr166TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJsr166TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJsr166TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreJsr166TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases
index 1004d35..e9f659b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreLegacy22TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreLegacy22TestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreLegacy22TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreLegacy22TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases
index cb0dfb6..0ade9b6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOjTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreOjTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreOjTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOjTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOjTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreOjTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases
index 46c76a3..6406153 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreOkHttpTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreOkHttpTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreOkHttpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreOkHttpTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases
index f2eb6b2..5e773f4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases
index 4f98f5c..c1514ca 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofBCTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreWycheproofBCTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreWycheproofBCTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreWycheproofBCTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases
index 49f4b1a..ee4622d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLibcoreWycheproofConscryptTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLibcoreWycheproofConscryptTestCases',
test_name='cheets_CTS_P.arm.CtsLibcoreWycheproofConscryptTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreWycheproofConscryptTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases
index 7c301db..f2b2c10 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLiblogTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLiblogTestCases',
test_name='cheets_CTS_P.arm.CtsLiblogTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLiblogTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLiblogTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLiblogTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases
index f424e73..2f6ba99 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLocation2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLocation2TestCases',
test_name='cheets_CTS_P.arm.CtsLocation2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocation2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases
index c5adfff..5d96ff7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLocationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLocationTestCases',
test_name='cheets_CTS_P.arm.CtsLocationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases
index 9b3d0d0..74b0861 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsLogdTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsLogdTestCases',
test_name='cheets_CTS_P.arm.CtsLogdTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLogdTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLogdTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLogdTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases
index 1fe25a0..595f21c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaBitstreamsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMediaBitstreamsTestCases',
test_name='cheets_CTS_P.arm.CtsMediaBitstreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaBitstreamsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaBitstreamsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases
index 34cc4aa..46710be 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMediaHostTestCases',
test_name='cheets_CTS_P.arm.CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases
index 0cb798d..9c5f531 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaStressTestCases
@@ -25,8 +25,8 @@
needs_push_media=True,
tag='arm.CtsMediaStressTestCases',
test_name='cheets_CTS_P.arm.CtsMediaStressTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases
index 41ee0df..336833a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMediaTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsMediaTestCases',
test_name='cheets_CTS_P.arm.CtsMediaTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases
index cd732c2..58711ac 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMidiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMidiTestCases',
test_name='cheets_CTS_P.arm.CtsMidiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMidiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases
index f54d46c..604984b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingDebuggableTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMockingDebuggableTestCases',
test_name='cheets_CTS_P.arm.CtsMockingDebuggableTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMockingDebuggableTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases
index 3d04469..b6a76c6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMockingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMockingTestCases',
test_name='cheets_CTS_P.arm.CtsMockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMockingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases
index f04ec7b..4d77914 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMonkeyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMonkeyTestCases',
test_name='cheets_CTS_P.arm.CtsMonkeyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMonkeyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMonkeyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMonkeyTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases
index c6bf40c..a0009ed 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMultiUserHostTestCases',
test_name='cheets_CTS_P.arm.CtsMultiUserHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMultiUserHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases
index 8b472d5..7f45940 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsMultiUserTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsMultiUserTestCases',
test_name='cheets_CTS_P.arm.CtsMultiUserTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMultiUserTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases
index 69fd77e..006f728 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNNAPITestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNNAPITestCases',
test_name='cheets_CTS_P.arm.CtsNNAPITestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNNAPITestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNNAPITestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNNAPITestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases
index 379e8bc..447391c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeHardwareTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNativeHardwareTestCases',
test_name='cheets_CTS_P.arm.CtsNativeHardwareTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeHardwareTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases
index 0ad46f9..2423f39 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaAAudioTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNativeMediaAAudioTestCases',
test_name='cheets_CTS_P.arm.CtsNativeMediaAAudioTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases
index af87bf0..08a58ee 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaSlTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNativeMediaSlTestCases',
test_name='cheets_CTS_P.arm.CtsNativeMediaSlTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaSlTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaSlTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaSlTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases
index e9eafed..aff164a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeMediaXaTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNativeMediaXaTestCases',
test_name='cheets_CTS_P.arm.CtsNativeMediaXaTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaXaTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaXaTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaXaTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases
index f28890f..b59e1a0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNativeNetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNativeNetTestCases',
test_name='cheets_CTS_P.arm.CtsNativeNetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeNetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeNetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases
index d2e744a..569f37c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNdefTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNdefTestCases',
test_name='cheets_CTS_P.arm.CtsNdefTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNdefTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNdefTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNdefTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases
index 68e12e5..57ade70 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigAttributeTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigAttributeTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigAttributeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigAttributeTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
index 8d36d87..20039b6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigBasicDebugDisabledTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigBasicDebugDisabledTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigBasicDebugDisabledTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
index ee6a0a0..17d1d17 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigBasicDebugEnabledTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigBasicDebugEnabledTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigBasicDebugEnabledTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
index d385147..f8f04d3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigBasicDomainConfigTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigBasicDomainConfigTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigBasicDomainConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigBasicDomainConfigTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases
index 0bfc135..fe62ad3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigCleartextTrafficTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigCleartextTrafficTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigCleartextTrafficTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigCleartextTrafficTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases
index 3663c34..5873feb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigDownloadManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigDownloadManagerTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigDownloadManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigDownloadManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases
index 7f3085d..2c84bd1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigInvalidPinTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigInvalidPinTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigInvalidPinTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigInvalidPinTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
index fb47a1c..4b784ee 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigNestedDomainConfigTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigNestedDomainConfigTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigNestedDomainConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigNestedDomainConfigTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases
index 9099182..0032a4f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigPrePCleartextTrafficTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigPrePCleartextTrafficTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigPrePCleartextTrafficTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigPrePCleartextTrafficTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases
index d03ab78..c2635f8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecConfigResourcesSrcTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecConfigResourcesSrcTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecConfigResourcesSrcTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigResourcesSrcTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index 804f9ce..0817526 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecPolicyUsesCleartextTrafficFalseTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index b1db4bc..e2870bc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecPolicyUsesCleartextTrafficTrueTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 328f8db..cde8160 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases',
test_name='cheets_CTS_P.arm.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases
index 46cdce1..1e6fac3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsNetTestCases',
test_name='cheets_CTS_P.arm.CtsNetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22
index 9b21ab8..b961a57 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyApi22
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetTestCasesLegacyApi22',
test_name='cheets_CTS_P.arm.CtsNetTestCasesLegacyApi22',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCasesLegacyApi22',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22
index 0505d3b..74df593 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsNetTestCasesLegacyPermission22
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsNetTestCasesLegacyPermission22',
test_name='cheets_CTS_P.arm.CtsNetTestCasesLegacyPermission22',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCasesLegacyPermission22',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases
index 7c675ed..47d146e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOmapiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOmapiTestCases',
test_name='cheets_CTS_P.arm.CtsOmapiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOmapiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOmapiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOmapiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases
index 4e166f1..e1b7b25 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGLTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOpenGLTestCases',
test_name='cheets_CTS_P.arm.CtsOpenGLTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOpenGLTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases
index dcdf3bb..bedd267 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerf2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOpenGlPerf2TestCases',
test_name='cheets_CTS_P.arm.CtsOpenGlPerf2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerf2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerf2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOpenGlPerf2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases
index 6229624..7582165 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOpenGlPerfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOpenGlPerfTestCases',
test_name='cheets_CTS_P.arm.CtsOpenGlPerfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOpenGlPerfTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases
index 9bebc78..c028eac 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOsHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOsHostTestCases',
test_name='cheets_CTS_P.arm.CtsOsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOsHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases
index c06f034..caaa3b9 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsOsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsOsTestCases',
test_name='cheets_CTS_P.arm.CtsOsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases
index 1d2ced5..c77630f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPdfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPdfTestCases',
test_name='cheets_CTS_P.arm.CtsPdfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPdfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPdfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPdfTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases
index 73d98a3..6ab347c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPerfettoTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPerfettoTestCases',
test_name='cheets_CTS_P.arm.CtsPerfettoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases
index d2f6e84..2d64e4b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPermission2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPermission2TestCases',
test_name='cheets_CTS_P.arm.CtsPermission2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermission2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases
index 4d52286..424e34c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPermissionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPermissionTestCases',
test_name='cheets_CTS_P.arm.CtsPermissionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermissionTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases
index 6f62cc0..16dbc8e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPreference2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPreference2TestCases',
test_name='cheets_CTS_P.arm.CtsPreference2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreference2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases
index 8ea923a..ce797a2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPreferenceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPreferenceTestCases',
test_name='cheets_CTS_P.arm.CtsPreferenceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreferenceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreferenceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases
index 6703c9b..3d99ffc 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsPrintTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsPrintTestCases',
test_name='cheets_CTS_P.arm.CtsPrintTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPrintTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases
index 6ab6cfa..cfdc2d6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsProtoTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsProtoTestCases',
test_name='cheets_CTS_P.arm.CtsProtoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProtoTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProtoTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsProtoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases
index 857dcb7..521d786 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsProviderTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsProviderTestCases',
test_name='cheets_CTS_P.arm.CtsProviderTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProviderTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProviderTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsProviderTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases
index 78030ab..cb2bf83 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptLegacyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsRenderscriptLegacyTestCases',
test_name='cheets_CTS_P.arm.CtsRenderscriptLegacyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRenderscriptLegacyTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases
index acf1bb7..d8c20f5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRenderscriptTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsRenderscriptTestCases',
test_name='cheets_CTS_P.arm.CtsRenderscriptTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRenderscriptTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases
index 50f60d6..58990de 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRsBlasTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsRsBlasTestCases',
test_name='cheets_CTS_P.arm.CtsRsBlasTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRsBlasTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases
index 17320d9..0da00a6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsRsCppTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsRsCppTestCases',
test_name='cheets_CTS_P.arm.CtsRsCppTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsCppTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRsCppTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases
index ffdba9c..0e9d348 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSampleDeviceTestCases',
test_name='cheets_CTS_P.arm.CtsSampleDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases
index 9e76a63..9640811 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSampleHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSampleHostTestCases',
test_name='cheets_CTS_P.arm.CtsSampleHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases
index 7f1389b..d98c49b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSaxTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSaxTestCases',
test_name='cheets_CTS_P.arm.CtsSaxTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSaxTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSaxTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSaxTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases
index 21413fc..d6f8db3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSeccompHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSeccompHostTestCases',
test_name='cheets_CTS_P.arm.CtsSeccompHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSeccompHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSeccompHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSeccompHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1
index 63d60e8..ff75fed 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases1
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSecureElementAccessControlTestCases1',
test_name='cheets_CTS_P.arm.CtsSecureElementAccessControlTestCases1',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecureElementAccessControlTestCases1',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2
index 8287b38..5b5285c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSecureElementAccessControlTestCases2',
test_name='cheets_CTS_P.arm.CtsSecureElementAccessControlTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecureElementAccessControlTestCases2',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3
index 2387da6..c6b054e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecureElementAccessControlTestCases3
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSecureElementAccessControlTestCases3',
test_name='cheets_CTS_P.arm.CtsSecureElementAccessControlTestCases3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecureElementAccessControlTestCases3',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases
index f6649e9..db5b826 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityHostTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsSecurityHostTestCases',
test_name='cheets_CTS_P.arm.CtsSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecurityHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases
index b843c2c..b659ded 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSecurityTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsSecurityTestCases',
test_name='cheets_CTS_P.arm.CtsSecurityTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecurityTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases
index 0381bea..ebcb07f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk25TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSelinuxTargetSdk25TestCases',
test_name='cheets_CTS_P.arm.CtsSelinuxTargetSdk25TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSelinuxTargetSdk25TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases
index 6cb9106..2fefcb2 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdk27TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSelinuxTargetSdk27TestCases',
test_name='cheets_CTS_P.arm.CtsSelinuxTargetSdk27TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSelinuxTargetSdk27TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases
index 8b4d56e..54b9fdf 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSelinuxTargetSdkCurrentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSelinuxTargetSdkCurrentTestCases',
test_name='cheets_CTS_P.arm.CtsSelinuxTargetSdkCurrentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSelinuxTargetSdkCurrentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases
index d198f80..f8bc45f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSensorTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSensorTestCases',
test_name='cheets_CTS_P.arm.CtsSensorTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases
index be6c12f..9925512 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsShortcutHostTestCases',
test_name='cheets_CTS_P.arm.CtsShortcutHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsShortcutHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases
index 36d1e5b..699e76c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsShortcutManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsShortcutManagerTestCases',
test_name='cheets_CTS_P.arm.CtsShortcutManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsShortcutManagerTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases
index 459f290..c65fe47 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleCpuTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSimpleCpuTestCases',
test_name='cheets_CTS_P.arm.CtsSimpleCpuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleCpuTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleCpuTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSimpleCpuTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases
index 5244c93..6b12073 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSimpleperfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSimpleperfTestCases',
test_name='cheets_CTS_P.arm.CtsSimpleperfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleperfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleperfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSimpleperfTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases
index 9707304..71bf9c8 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSkQPTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSkQPTestCases',
test_name='cheets_CTS_P.arm.CtsSkQPTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSkQPTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSkQPTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSkQPTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases
index 26b7783..10fabd6 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSliceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSliceTestCases',
test_name='cheets_CTS_P.arm.CtsSliceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSliceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSliceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSliceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases
index 9f1dfc7..3e23202 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSpeechTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSpeechTestCases',
test_name='cheets_CTS_P.arm.CtsSpeechTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSpeechTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSpeechTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSpeechTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases
index 8358d7a..aa43f0d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsStatsdHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsStatsdHostTestCases',
test_name='cheets_CTS_P.arm.CtsStatsdHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsStatsdHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsStatsdHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsStatsdHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases
index f536e2e..4dbbc3f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSustainedPerformanceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSustainedPerformanceHostTestCases',
test_name='cheets_CTS_P.arm.CtsSustainedPerformanceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases
index 0eb8f38..7908879 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncAccountAccessOtherCertTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSyncAccountAccessOtherCertTestCases',
test_name='cheets_CTS_P.arm.CtsSyncAccountAccessOtherCertTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSyncAccountAccessOtherCertTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases
index 008bb7d..95e5f6e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncContentHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSyncContentHostTestCases',
test_name='cheets_CTS_P.arm.CtsSyncContentHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncContentHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncContentHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSyncContentHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases
index f56f0ee..dbb9eec 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSyncManagerTestsCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSyncManagerTestsCases',
test_name='cheets_CTS_P.arm.CtsSyncManagerTestsCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncManagerTestsCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSyncManagerTestsCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases
index e77d99c..875ecb0 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiAnnotationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSystemApiAnnotationTestCases',
test_name='cheets_CTS_P.arm.CtsSystemApiAnnotationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemApiAnnotationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases
index 6e54fcc..d53ccd3 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSystemApiSignatureTestCases',
test_name='cheets_CTS_P.arm.CtsSystemApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemApiSignatureTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases
index 9f7d6b7..a1fed73 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemIntentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSystemIntentTestCases',
test_name='cheets_CTS_P.arm.CtsSystemIntentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemIntentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemIntentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemIntentTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases
index d90c75c..4b354b1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSystemUiHostTestCases',
test_name='cheets_CTS_P.arm.CtsSystemUiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemUiHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases
index 0b6094a..7fbb6df 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsSystemUiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsSystemUiTestCases',
test_name='cheets_CTS_P.arm.CtsSystemUiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemUiTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases
index 93b454c..9e348c1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTelecomTestCases',
test_name='cheets_CTS_P.arm.CtsTelecomTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelecomTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2
index 91c8e38..24b848a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTelecomTestCases2',
test_name='cheets_CTS_P.arm.CtsTelecomTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelecomTestCases2',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3 b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3
index bdfaf03..9e5f4ba 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelecomTestCases3
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTelecomTestCases3',
test_name='cheets_CTS_P.arm.CtsTelecomTestCases3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases3', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelecomTestCases3',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases
index d20ae41..556fa14 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephony2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTelephony2TestCases',
test_name='cheets_CTS_P.arm.CtsTelephony2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelephony2TestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases
index 8873f3b..9dac470 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTelephonyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTelephonyTestCases',
test_name='cheets_CTS_P.arm.CtsTelephonyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephonyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelephonyTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases
index a694124..97d0431 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTextTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTextTestCases',
test_name='cheets_CTS_P.arm.CtsTextTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTextTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases
index 2eac6b2..65a2f4b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsThemeDeviceTestCases',
test_name='cheets_CTS_P.arm.CtsThemeDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsThemeDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases
index d2b38cd..74e0c33 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsThemeHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsThemeHostTestCases',
test_name='cheets_CTS_P.arm.CtsThemeHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsThemeHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases
index c65058d..bfd167a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsToastLegacyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsToastLegacyTestCases',
test_name='cheets_CTS_P.arm.CtsToastLegacyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsToastLegacyTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases
index c8c569d..a1ee31b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsToastTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsToastTestCases',
test_name='cheets_CTS_P.arm.CtsToastTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsToastTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases
index c6c814f..0818616 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTransitionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTransitionTestCases',
test_name='cheets_CTS_P.arm.CtsTransitionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTransitionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTransitionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTransitionTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases
index cc7e792..ad7fe59 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTrustedVoiceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTrustedVoiceHostTestCases',
test_name='cheets_CTS_P.arm.CtsTrustedVoiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTrustedVoiceHostTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases
index f3aa942..707aa8f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTvProviderTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTvProviderTestCases',
test_name='cheets_CTS_P.arm.CtsTvProviderTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTvProviderTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases
index 55a4786..885efa5 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsTvTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsTvTestCases',
test_name='cheets_CTS_P.arm.CtsTvTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTvTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases
index 2e3c28d..9c71f97 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUiAutomationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUiAutomationTestCases',
test_name='cheets_CTS_P.arm.CtsUiAutomationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiAutomationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases
index 260e2e0..a086a13 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUiDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUiDeviceTestCases',
test_name='cheets_CTS_P.arm.CtsUiDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases
index 27ec664..327f20a 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUiRenderingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUiRenderingTestCases',
test_name='cheets_CTS_P.arm.CtsUiRenderingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiRenderingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiRenderingTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases
index de206c2..e4bce80 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUidIsolationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUidIsolationTestCases',
test_name='cheets_CTS_P.arm.CtsUidIsolationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUidIsolationTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUnofficialApisUsageTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUnofficialApisUsageTestCases
index 02dd1a4..fd3dabb 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUnofficialApisUsageTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUnofficialApisUsageTestCases',
test_name='cheets_CTS_P.arm.CtsUnofficialApisUsageTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUnofficialApisUsageTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUnofficialApisUsageTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUnofficialApisUsageTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases
index 731d26e..7849dbe 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUsageStatsTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='arm.CtsUsageStatsTestCases',
test_name='cheets_CTS_P.arm.CtsUsageStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests
index 9e0f24f..8e61e60 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUsbTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUsbTests',
test_name='cheets_CTS_P.arm.CtsUsbTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsbTests',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases
index 83af548..ae4d023 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsUtilTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsUtilTestCases',
test_name='cheets_CTS_P.arm.CtsUtilTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUtilTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUtilTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUtilTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases
index b844fcc..f18d26d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVideoTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsVideoTestCases',
test_name='cheets_CTS_P.arm.CtsVideoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVideoTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVideoTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases
index 81c4312..689a854 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsViewTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsViewTestCases',
test_name='cheets_CTS_P.arm.CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases
index 9be1487..98fe803 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVmTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsVmTestCases',
test_name='cheets_CTS_P.arm.CtsVmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVmTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases
index e8ee2a0..f5b6c4b 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceInteractionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsVoiceInteractionTestCases',
test_name='cheets_CTS_P.arm.CtsVoiceInteractionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVoiceInteractionTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases
index 5544d9c..8dd774c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVoiceSettingsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsVoiceSettingsTestCases',
test_name='cheets_CTS_P.arm.CtsVoiceSettingsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceSettingsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVoiceSettingsTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases
index 540dfe5..fc4676c 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsVrTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsVrTestCases',
test_name='cheets_CTS_P.arm.CtsVrTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVrTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVrTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVrTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases
index ca66c5f..dda8853 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWebkitTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWebkitTestCases',
test_name='cheets_CTS_P.arm.CtsWebkitTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWebkitTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWebkitTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWebkitTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases
index 014e5d8..3fdc91f 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWidgetTestCases',
test_name='cheets_CTS_P.arm.CtsWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWidgetTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases
index bc9a3be..e9f228d 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWindowManagerDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWindowManagerDeviceTestCases',
test_name='cheets_CTS_P.arm.CtsWindowManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWindowManagerDeviceTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases
index 11371b6..3222d0e 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapNoWrapTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWrapNoWrapTestCases',
test_name='cheets_CTS_P.arm.CtsWrapNoWrapTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapNoWrapTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases
index cae9290..adc8a02 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugMallocDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWrapWrapDebugMallocDebugTestCases',
test_name='cheets_CTS_P.arm.CtsWrapWrapDebugMallocDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapWrapDebugMallocDebugTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases
index d6137de..9df6ff1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWrapWrapDebugTestCases',
test_name='cheets_CTS_P.arm.CtsWrapWrapDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapWrapDebugTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases
index 78db64d..ec1b463 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.arm.CtsWrapWrapNoDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.CtsWrapWrapNoDebugTestCases',
test_name='cheets_CTS_P.arm.CtsWrapWrapNoDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapWrapNoDebugTestCases',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api
index 850a78a..33256f4 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.arm.cts-system-all.api
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.cts-system-all.api',
test_name='cheets_CTS_P.arm.cts-system-all.api',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'cts-system-all.api', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'cts-system-all.api', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='cts-system-all.api',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1
index e9e13c7..4c6e803 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases1
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.signed-CtsSecureElementAccessControlTestCases1',
test_name='cheets_CTS_P.arm.signed-CtsSecureElementAccessControlTestCases1',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='signed-CtsSecureElementAccessControlTestCases1',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2
index e8d0fa4..28b8ec1 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.signed-CtsSecureElementAccessControlTestCases2',
test_name='cheets_CTS_P.arm.signed-CtsSecureElementAccessControlTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='signed-CtsSecureElementAccessControlTestCases2',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3
index eae3470..2250fd7 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.arm.signed-CtsSecureElementAccessControlTestCases3
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.signed-CtsSecureElementAccessControlTestCases3',
test_name='cheets_CTS_P.arm.signed-CtsSecureElementAccessControlTestCases3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='signed-CtsSecureElementAccessControlTestCases3',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf
index 564f3aa..d663c96 100644
--- a/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.arm.vm-tests-tf
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='arm.vm-tests-tf',
test_name='cheets_CTS_P.arm.vm-tests-tf',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'vm-tests-tf', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'vm-tests-tf', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='vm-tests-tf',
target_plan=None,
bundle='arm',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases
index 6e79398..3071930 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAbiOverrideHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAbiOverrideHostTestCases',
test_name='cheets_CTS_P.x86.CtsAbiOverrideHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAbiOverrideHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAbiOverrideHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases
index c520790..8a91267 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccelerationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccelerationTestCases',
test_name='cheets_CTS_P.x86.CtsAccelerationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccelerationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccelerationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccelerationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases
index 7c7e503..354ec5b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccessibilityServiceTestCases',
test_name='cheets_CTS_P.x86.CtsAccessibilityServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases
index c19db69..662490e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccessibilityTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccessibilityTestCases',
test_name='cheets_CTS_P.x86.CtsAccessibilityTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccessibilityTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccessibilityTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases
index a6a80b1..594fe58 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAccountManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAccountManagerTestCases',
test_name='cheets_CTS_P.x86.CtsAccountManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAccountManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAccountManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases
index 8808724..1d57a14 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceSdk25TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsActivityManagerDeviceSdk25TestCases',
test_name='cheets_CTS_P.x86.CtsActivityManagerDeviceSdk25TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceSdk25TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsActivityManagerDeviceSdk25TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
index d237761..ac41b4f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsActivityManagerDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsActivityManagerDeviceTestCases',
test_name='cheets_CTS_P.x86.CtsActivityManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsActivityManagerDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsActivityManagerDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases
index d9b1838..6ff8850 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminPackageInstallerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAdminPackageInstallerTestCases',
test_name='cheets_CTS_P.x86.CtsAdminPackageInstallerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminPackageInstallerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAdminPackageInstallerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases
index a82e551..71726dd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAdminTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAdminTestCases',
test_name='cheets_CTS_P.x86.CtsAdminTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAdminTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAdminTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases
index 9e7b200..d396b68 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmClockTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAlarmClockTestCases',
test_name='cheets_CTS_P.x86.CtsAlarmClockTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmClockTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAlarmClockTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases
index 4202a59..c2d28cd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAlarmManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAlarmManagerTestCases',
test_name='cheets_CTS_P.x86.CtsAlarmManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAlarmManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAlarmManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases
index 8463777..bca174a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidAppTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAndroidAppTestCases',
test_name='cheets_CTS_P.x86.CtsAndroidAppTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidAppTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidAppTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases
index 1e8c3a8..a1662c5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestBase27ApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAndroidTestBase27ApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsAndroidTestBase27ApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestBase27ApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidTestBase27ApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases
index 396715b..9d14f9b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestMockCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAndroidTestMockCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsAndroidTestMockCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestMockCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidTestMockCurrentApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases
index cb2bd02..91f81d1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsAndroidTestRunnerCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAndroidTestRunnerCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAndroidTestRunnerCurrentApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases
index cf9e61e..19b5bfe 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAnimationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAnimationTestCases',
test_name='cheets_CTS_P.x86.CtsAnimationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAnimationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAnimationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases
index 9e69157..fd74e7f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacy27ApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsApacheHttpLegacy27ApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsApacheHttpLegacy27ApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacy27ApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsApacheHttpLegacy27ApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases
index ad8579f..ca4b83d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsApacheHttpLegacyCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsApacheHttpLegacyCurrentApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
index 203c9db..0ef6134 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsApacheHttpLegacyUsesLibraryApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases
index ce6d4a9..1b0302f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppComponentFactoryTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppComponentFactoryTestCases',
test_name='cheets_CTS_P.x86.CtsAppComponentFactoryTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppComponentFactoryTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppComponentFactoryTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases
index c6b1f4b..e6a11808 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppSecurityHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppSecurityHostTestCases',
test_name='cheets_CTS_P.x86.CtsAppSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppSecurityHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases
index 21f8bd5..2eeef9a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppTestCases',
test_name='cheets_CTS_P.x86.CtsAppTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases
index 61dfebc..4d22041 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppUsageHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppUsageHostTestCases',
test_name='cheets_CTS_P.x86.CtsAppUsageHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppUsageHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppUsageHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppUsageHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases
index 5e94ff6..aefc926 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAppWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAppWidgetTestCases',
test_name='cheets_CTS_P.x86.CtsAppWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAppWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAppWidgetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases
index ea650eb..614315a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAslrMallocTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAslrMallocTestCases',
test_name='cheets_CTS_P.x86.CtsAslrMallocTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAslrMallocTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAslrMallocTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAslrMallocTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases
index 3568041..1f8794b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAssistTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAssistTestCases',
test_name='cheets_CTS_P.x86.CtsAssistTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAssistTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAssistTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAssistTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases
index 1f921f7..5d58b15 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAtraceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAtraceHostTestCases',
test_name='cheets_CTS_P.x86.CtsAtraceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAtraceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAtraceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAtraceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases
index 9dd0c5f..13bd5ff 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsAutoFillServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsAutoFillServiceTestCases',
test_name='cheets_CTS_P.x86.CtsAutoFillServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAutoFillServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsAutoFillServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsAutoFillServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases
index 1ae59e7..d1d44c1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBackgroundRestrictionsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBackgroundRestrictionsTestCases',
test_name='cheets_CTS_P.x86.CtsBackgroundRestrictionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackgroundRestrictionsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackgroundRestrictionsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases
index 4f9d620..f09ee4c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBackupHostTestCases',
test_name='cheets_CTS_P.x86.CtsBackupHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackupHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases
index e70aad4..ac23ea3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBackupTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBackupTestCases',
test_name='cheets_CTS_P.x86.CtsBackupTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBackupTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBackupTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases
index b182ecf..cb9660a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBatterySavingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBatterySavingTestCases',
test_name='cheets_CTS_P.x86.CtsBatterySavingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBatterySavingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBatterySavingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBatterySavingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases
index 774f340..95ba274 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBionicTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBionicTestCases',
test_name='cheets_CTS_P.x86.CtsBionicTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBionicTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBionicTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBionicTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases
index 87e5b47..808b5ca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBluetoothTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBluetoothTestCases',
test_name='cheets_CTS_P.x86.CtsBluetoothTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBluetoothTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBluetoothTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBluetoothTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases
index d4d7c41..14a26dd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsBootStatsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsBootStatsTestCases',
test_name='cheets_CTS_P.x86.CtsBootStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBootStatsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsBootStatsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsBootStatsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases
index d086526..5c7e61d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCalendarcommon2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCalendarcommon2TestCases',
test_name='cheets_CTS_P.x86.CtsCalendarcommon2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCalendarcommon2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCalendarcommon2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCalendarcommon2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases
index 47f6040..c1a2220 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraApi25TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCameraApi25TestCases',
test_name='cheets_CTS_P.x86.CtsCameraApi25TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraApi25TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraApi25TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
index 651adaa..75c1e50 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCameraTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsCameraTestCases',
test_name='cheets_CTS_P.x86.CtsCameraTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCameraTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCameraTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases
index 306a3cf..c28f15a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCarTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCarTestCases',
test_name='cheets_CTS_P.x86.CtsCarTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCarTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases
index ff70913..899278d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCarrierApiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCarrierApiTestCases',
test_name='cheets_CTS_P.x86.CtsCarrierApiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarrierApiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCarrierApiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCarrierApiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases
index 7d8d334..8445f55 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsColorModeTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsColorModeTestCases',
test_name='cheets_CTS_P.x86.CtsColorModeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsColorModeTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsColorModeTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsColorModeTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases
index 35cb6f6..95fb6e0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCompilationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCompilationTestCases',
test_name='cheets_CTS_P.x86.CtsCompilationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCompilationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCompilationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCompilationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe b/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe
index 184a839..53734cb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsContactsProviderWipe
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsContactsProviderWipe',
test_name='cheets_CTS_P.x86.CtsContactsProviderWipe',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContactsProviderWipe', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContactsProviderWipe', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsContactsProviderWipe',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases
index 2e676ec..39950d0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsContentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsContentTestCases',
test_name='cheets_CTS_P.x86.CtsContentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsContentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsContentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases
index 036d8a6..c75a35b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCppToolsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCppToolsTestCases',
test_name='cheets_CTS_P.x86.CtsCppToolsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCppToolsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCppToolsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCppToolsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases
index 4927866..9d9f0dc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsCurrentApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsCurrentApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsCurrentApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsCurrentApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsCurrentApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases
index 79d63a4..4d5e7f4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDatabaseTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDatabaseTestCases',
test_name='cheets_CTS_P.x86.CtsDatabaseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDatabaseTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDatabaseTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases
index 1480d9c..dfdca20 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDebugTestCases',
test_name='cheets_CTS_P.x86.CtsDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDebugTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
index 94c3688..5efd8b4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeqpTestCases
@@ -28,8 +28,8 @@
needs_push_media=False,
tag='x86.CtsDeqpTestCases',
test_name='cheets_CTS_P.x86.CtsDeqpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeqpTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeqpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases
index 20c315d..8ebd383 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDeviceIdleHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDeviceIdleHostTestCases',
test_name='cheets_CTS_P.x86.CtsDeviceIdleHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDeviceIdleHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDeviceIdleHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases
index 2d099d3..b849dc2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDevicePolicyManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDevicePolicyManagerTestCases',
test_name='cheets_CTS_P.x86.CtsDevicePolicyManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDevicePolicyManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDevicePolicyManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases
index 0078c69..96a5801 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDexMetadataHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDexMetadataHostTestCases',
test_name='cheets_CTS_P.x86.CtsDexMetadataHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDexMetadataHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDexMetadataHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDexMetadataHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases
index 77fe722..17fd4c7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDisplayTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDisplayTestCases',
test_name='cheets_CTS_P.x86.CtsDisplayTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDisplayTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDisplayTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases
index b7fc54d..f414ccd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDpiTestCases',
test_name='cheets_CTS_P.x86.CtsDpiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDpiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2
index 43d6ba6..9ff137c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDpiTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDpiTestCases2',
test_name='cheets_CTS_P.x86.CtsDpiTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDpiTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDpiTestCases2',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases
index 792c0b1..923f80d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDreamsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDreamsTestCases',
test_name='cheets_CTS_P.x86.CtsDreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDreamsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDreamsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases
index 8433466..94cd847 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDrmTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDrmTestCases',
test_name='cheets_CTS_P.x86.CtsDrmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDrmTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDrmTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDrmTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases
index 34d2780..3d3d876 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDumpsysHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDumpsysHostTestCases',
test_name='cheets_CTS_P.x86.CtsDumpsysHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDumpsysHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDumpsysHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDumpsysHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases
index 47319e5..cabee5b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsDynamicLinkerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsDynamicLinkerTestCases',
test_name='cheets_CTS_P.x86.CtsDynamicLinkerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDynamicLinkerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsDynamicLinkerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsDynamicLinkerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases
index 24d8ad2..2732300 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsEdiHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsEdiHostTestCases',
test_name='cheets_CTS_P.x86.CtsEdiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEdiHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEdiHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsEdiHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases
index 861b286..d055907 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsEffectTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsEffectTestCases',
test_name='cheets_CTS_P.x86.CtsEffectTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEffectTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsEffectTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsEffectTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases
index b28ff4a..3e73fbb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalServiceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsExternalServiceTestCases',
test_name='cheets_CTS_P.x86.CtsExternalServiceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalServiceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsExternalServiceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases
index 22de8fa..ffb8899 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsExternalSourcesTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsExternalSourcesTestCases',
test_name='cheets_CTS_P.x86.CtsExternalSourcesTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalSourcesTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsExternalSourcesTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsExternalSourcesTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases
index 52ddf59..8853200 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsFileSystemTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsFileSystemTestCases',
test_name='cheets_CTS_P.x86.CtsFileSystemTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFileSystemTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFileSystemTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases
index 3d95b54..33e9a35 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsFragmentTestCases',
test_name='cheets_CTS_P.x86.CtsFragmentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26 b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26
index f13bfed..102add6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsFragmentTestCasesSdk26
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsFragmentTestCasesSdk26',
test_name='cheets_CTS_P.x86.CtsFragmentTestCasesSdk26',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCasesSdk26', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsFragmentTestCasesSdk26', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsFragmentTestCasesSdk26',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases
index 67a9540..590b281 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsGestureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsGestureTestCases',
test_name='cheets_CTS_P.x86.CtsGestureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGestureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGestureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases
index a2b0877..7f8b512 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsGpuToolsHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsGpuToolsHostTestCases',
test_name='cheets_CTS_P.x86.CtsGpuToolsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGpuToolsHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGpuToolsHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGpuToolsHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases
index 0a843d6..5152483 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsGraphicsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsGraphicsTestCases',
test_name='cheets_CTS_P.x86.CtsGraphicsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGraphicsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsGraphicsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsGraphicsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases
index 5260765..3fb67d7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHardwareTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHardwareTestCases',
test_name='cheets_CTS_P.x86.CtsHardwareTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHardwareTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHardwareTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHardwareTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases
index c5c6042..54ba051 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHarmfulAppWarningHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHarmfulAppWarningHostTestCases',
test_name='cheets_CTS_P.x86.CtsHarmfulAppWarningHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHarmfulAppWarningHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHarmfulAppWarningHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases
index cfe3835..d833f8f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistApi27TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHiddenApiBlacklistApi27TestCases',
test_name='cheets_CTS_P.x86.CtsHiddenApiBlacklistApi27TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistApi27TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiBlacklistApi27TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases
index a85a5f7..e200b21 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistCurrentApiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHiddenApiBlacklistCurrentApiTestCases',
test_name='cheets_CTS_P.x86.CtsHiddenApiBlacklistCurrentApiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistCurrentApiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiBlacklistCurrentApiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases
index 4be97ef..f70b3e3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiBlacklistDebugClassTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHiddenApiBlacklistDebugClassTestCases',
test_name='cheets_CTS_P.x86.CtsHiddenApiBlacklistDebugClassTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiBlacklistDebugClassTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiBlacklistDebugClassTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases
index 7b2e94b..d602453 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchDebugClassTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHiddenApiKillswitchDebugClassTestCases',
test_name='cheets_CTS_P.x86.CtsHiddenApiKillswitchDebugClassTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchDebugClassTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiKillswitchDebugClassTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases
index 441e626..13398d2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWhitelistTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHiddenApiKillswitchWhitelistTestCases',
test_name='cheets_CTS_P.x86.CtsHiddenApiKillswitchWhitelistTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWhitelistTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiKillswitchWhitelistTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases
index b54d206..9880c3d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHiddenApiKillswitchWildcardTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHiddenApiKillswitchWildcardTestCases',
test_name='cheets_CTS_P.x86.CtsHiddenApiKillswitchWildcardTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHiddenApiKillswitchWildcardTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHiddenApiKillswitchWildcardTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests
index aef5878..825db61 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostTzDataTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHostTzDataTests',
test_name='cheets_CTS_P.x86.CtsHostTzDataTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostTzDataTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostTzDataTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostTzDataTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests
index c44079f..ecd48e5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNetworkTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHostsideNetworkTests',
test_name='cheets_CTS_P.x86.CtsHostsideNetworkTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNetworkTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideNetworkTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases
index b2f0405..a250d46 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideNumberBlockingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHostsideNumberBlockingTestCases',
test_name='cheets_CTS_P.x86.CtsHostsideNumberBlockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideNumberBlockingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideNumberBlockingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests
index 39da80a..eba45d6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideTvTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHostsideTvTests',
test_name='cheets_CTS_P.x86.CtsHostsideTvTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideTvTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideTvTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideTvTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests
index acd2f0d..2039322 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsHostsideWebViewTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsHostsideWebViewTests',
test_name='cheets_CTS_P.x86.CtsHostsideWebViewTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideWebViewTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsHostsideWebViewTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsHostsideWebViewTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases
index 732bc4f..3f53d9b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsIcuTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsIcuTestCases',
test_name='cheets_CTS_P.x86.CtsIcuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIcuTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIcuTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsIcuTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases
index c9f696e..bfbdeac 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsIncidentHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsIncidentHostTestCases',
test_name='cheets_CTS_P.x86.CtsIncidentHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIncidentHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIncidentHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsIncidentHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases
index 8967a93..5faba1e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsInlineMockingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsInlineMockingTestCases',
test_name='cheets_CTS_P.x86.CtsInlineMockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInlineMockingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInlineMockingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInlineMockingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases
index 5627004..b324a61 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodServiceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsInputMethodServiceHostTestCases',
test_name='cheets_CTS_P.x86.CtsInputMethodServiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodServiceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodServiceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases
index fee2c1f..c92787b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsInputMethodTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsInputMethodTestCases',
test_name='cheets_CTS_P.x86.CtsInputMethodTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsInputMethodTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsInputMethodTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases
index 46b360f..37a56ca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsIntentSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsIntentSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsIntentSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIntentSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsIntentSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsIntentSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases
index 2868fd3..43db5cc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJankDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJankDeviceTestCases',
test_name='cheets_CTS_P.x86.CtsJankDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJankDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJankDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJankDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases
index fef6886..4763a83 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpSecurityHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJdwpSecurityHostTestCases',
test_name='cheets_CTS_P.x86.CtsJdwpSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJdwpSecurityHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases
index 2450dcb..973ee6e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJdwpTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJdwpTestCases',
test_name='cheets_CTS_P.x86.CtsJdwpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJdwpTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJdwpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases
index de23f43..bb86ade 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJniTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJniTestCases',
test_name='cheets_CTS_P.x86.CtsJniTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJniTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJniTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJniTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases
index 561b3a3..396db9c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerSharedUidTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJobSchedulerSharedUidTestCases',
test_name='cheets_CTS_P.x86.CtsJobSchedulerSharedUidTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerSharedUidTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJobSchedulerSharedUidTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases
index df92688..0290611 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJobSchedulerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJobSchedulerTestCases',
test_name='cheets_CTS_P.x86.CtsJobSchedulerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJobSchedulerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJobSchedulerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases
index 7011b8f..5e563b7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiAttachingHostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiAttachingHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiAttachingHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases
index 95fe77e..204ebe0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiAttachingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiAttachingTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiAttachingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiAttachingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiAttachingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases
index df6ae79..cba61c4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRedefineClassesHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRedefineClassesHostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRedefineClassesHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRedefineClassesHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRedefineClassesHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases
index 6addf88..517f321 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1900HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1900HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1900HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1900HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1900HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases
index e6e5194..6e3608a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1901HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1901HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1901HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1901HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1901HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases
index 3ee0de1..15aaf60 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1902HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1902HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1902HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1902HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1902HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases
index 95e6b0a..be2fe39 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1903HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1903HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1903HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1903HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1903HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases
index 99ce818..46d59d9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1904HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1904HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1904HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1904HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1904HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases
index b3080b7..fea749c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1906HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1906HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1906HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1906HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1906HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases
index 898986b..1f633f0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1907HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1907HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1907HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1907HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1907HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases
index d64b455..2a18f5a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1908HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1908HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1908HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1908HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1908HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases
index 853cddf..ab48656 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1909HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1909HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1909HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1909HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1909HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases
index 3fbac19..ecd2404 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1910HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1910HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1910HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1910HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1910HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases
index 6006a41..1237145 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1911HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1911HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1911HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1911HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1911HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases
index e1ea697..e2a325b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1912HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1912HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1912HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1912HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1912HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases
index 5b960d6..8be66dd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1913HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1913HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1913HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1913HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1913HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases
index 7b2c6be..e1c137f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1914HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1914HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1914HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1914HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1914HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases
index 850186d..b4a17d0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1915HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1915HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1915HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1915HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1915HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases
index c9e3aba..1286d98 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1916HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1916HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1916HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1916HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1916HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases
index ad364d4..760547b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1917HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1917HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1917HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1917HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1917HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases
index b60d01c..d785df3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1920HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1920HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1920HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1920HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1920HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases
index 908ad41..174fbbe 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1921HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1921HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1921HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1921HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1921HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases
index b0ed32b..0e9abb7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1922HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1922HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1922HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1922HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1922HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases
index 0e019fa..8868c93 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1923HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1923HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1923HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1923HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1923HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases
index 71f624c..e67cb44 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1924HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1924HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1924HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1924HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1924HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases
index dc941fc..cbb83a4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1925HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1925HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1925HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1925HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1925HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases
index 38e0f15..53339e6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1926HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1926HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1926HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1926HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1926HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases
index ca4e092..4e4e76a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1927HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1927HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1927HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1927HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1927HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases
index b6e4c62..890692a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1928HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1928HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1928HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1928HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1928HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases
index ea2db5c..532e318 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1930HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1930HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1930HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1930HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1930HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases
index a462812..0720797 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1931HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1931HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1931HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1931HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1931HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases
index 462ffeb..4215044 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1932HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1932HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1932HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1932HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1932HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases
index cd6a858..284818e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1933HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1933HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1933HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1933HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1933HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases
index 8e5ea6a..5768d2c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1934HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1934HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1934HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1934HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1934HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases
index bdd12a0..721c0a1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1936HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1936HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1936HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1936HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1936HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases
index e6d78a0..1b71596 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1937HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1937HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1937HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1937HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1937HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases
index 269253d..cca0530 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1939HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1939HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1939HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1939HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1939HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases
index cac85db..84209e8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1941HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1941HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1941HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1941HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1941HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases
index 18c54a6..a944a59 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1942HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1942HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1942HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1942HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1942HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases
index 33a56dd..5e315cf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest1943HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest1943HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest1943HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest1943HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest1943HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases
index 64820a7..d92e6b8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest902HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest902HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest902HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest902HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest902HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases
index f30c595..db80e85 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest903HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest903HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest903HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest903HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest903HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases
index 6688b8b..536f286 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest904HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest904HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest904HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest904HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest904HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases
index 3196ef5..91b6e36 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest905HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest905HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest905HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest905HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest905HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases
index 5d1123f..87bd2c2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest906HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest906HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest906HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest906HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest906HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases
index 1bd8ad7..8fa6e56 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest907HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest907HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest907HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest907HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest907HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases
index 0ef7bc7..af88618 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest908HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest908HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest908HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest908HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest908HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases
index af23ae6..d50261f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest910HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest910HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest910HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest910HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest910HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases
index 4dca4a4..2596d55 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest911HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest911HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest911HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest911HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest911HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases
index 89a0d27..697d9fa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest912HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest912HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest912HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest912HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest912HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases
index aaad14a..bb01929 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest913HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest913HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest913HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest913HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest913HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases
index 6343bb1..f5451e4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest914HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest914HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest914HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest914HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest914HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases
index 375449d..259fa05 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest915HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest915HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest915HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest915HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest915HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases
index 84e1327..c257fa0 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest917HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest917HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest917HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest917HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest917HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases
index d9c06c0..4d7ed8a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest918HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest918HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest918HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest918HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest918HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases
index 77a4f17..ef5d111 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest919HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest919HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest919HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest919HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest919HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases
index 54506f9..0a865aa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest920HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest920HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest920HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest920HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest920HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases
index 11d8550..e6e3a91 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest922HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest922HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest922HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest922HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest922HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases
index 7706876..e7fddaa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest923HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest923HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest923HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest923HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest923HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases
index d220cce..57f8dbb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest924HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest924HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest924HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest924HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest924HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases
index 84eae56..c388081 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest926HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest926HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest926HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest926HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest926HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases
index 95a36e8..f5f8a25 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest927HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest927HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest927HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest927HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest927HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases
index 6215119..a16916d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest928HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest928HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest928HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest928HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest928HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases
index a0afcc3..a5a7993 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest930HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest930HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest930HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest930HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest930HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases
index f666456..ac90d47 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest931HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest931HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest931HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest931HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest931HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases
index f629922..6269ccd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest932HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest932HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest932HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest932HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest932HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases
index 112d843..1f40576 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest940HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest940HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest940HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest940HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest940HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases
index 3cf6350..a2331b5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest942HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest942HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest942HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest942HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest942HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases
index fd8ffbb..de4a0ca 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest944HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest944HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest944HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest944HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest944HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases
index 8a06de4..bc9fce3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest945HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest945HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest945HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest945HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest945HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases
index 64fd9ca..0b387d9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest947HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest947HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest947HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest947HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest947HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases
index 2f40b8a..11b11b4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest951HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest951HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest951HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest951HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest951HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases
index 6f84e12..0ae737e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest982HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest982HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest982HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest982HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest982HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases
index bf0ed1b..5f08b84 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest983HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest983HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest983HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest983HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest983HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases
index 8a6e12f..229cdd7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest984HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest984HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest984HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest984HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest984HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases
index 58f1ca3..80c862f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest985HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest985HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest985HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest985HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest985HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases
index da8c46a..a2922e7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest986HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest986HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest986HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest986HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest986HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases
index 94b199c..312c901 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest988HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest988HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest988HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest988HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest988HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases
index 4a4c6ea..cd83b96 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest989HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest989HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest989HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest989HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest989HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases
index 5106194..bf162a7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest990HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest990HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest990HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest990HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest990HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases
index 2e414a4..7ed7cd1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest991HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest991HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest991HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest991HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest991HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases
index 2b35350..b1ad618 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest992HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest992HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest992HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest992HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest992HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases
index e15ade1..8cb1274 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest993HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest993HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest993HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest993HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest993HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases
index 3aaec79..3a06144 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest994HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest994HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest994HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest994HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest994HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases
index fcdbd5a..6d63588 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest995HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest995HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest995HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest995HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest995HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases
index 4eccd4c..fbba03a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest996HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest996HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest996HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest996HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest996HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases
index 19f4afa..fa28469 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiRunTest997HostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiRunTest997HostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiRunTest997HostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiRunTest997HostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiRunTest997HostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases
index 093d3cb..be940e3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTaggingHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiTaggingHostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiTaggingHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTaggingHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiTaggingHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases
index c43aa20..1bbc3ae 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsJvmtiTrackingHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsJvmtiTrackingHostTestCases',
test_name='cheets_CTS_P.x86.CtsJvmtiTrackingHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsJvmtiTrackingHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsJvmtiTrackingHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases
index 3a4374f..92f4932 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsKernelConfigTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsKernelConfigTestCases',
test_name='cheets_CTS_P.x86.CtsKernelConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKernelConfigTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKernelConfigTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsKernelConfigTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases
index 6d8f84c..f91745d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsKeystoreTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsKeystoreTestCases',
test_name='cheets_CTS_P.x86.CtsKeystoreTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKeystoreTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsKeystoreTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsKeystoreTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases
index 14ce192..1a6f772 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLeanbackJankTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLeanbackJankTestCases',
test_name='cheets_CTS_P.x86.CtsLeanbackJankTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLeanbackJankTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLeanbackJankTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLeanbackJankTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases
index 5433b2e..e44ee0b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreFileIOTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreFileIOTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreFileIOTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreFileIOTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreFileIOTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJavaUtilCollectionsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJavaUtilCollectionsTestCases
index 6476ec5..8ac6936 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJavaUtilCollectionsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJavaUtilCollectionsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreJavaUtilCollectionsTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreJavaUtilCollectionsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJavaUtilCollectionsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJavaUtilCollectionsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreJavaUtilCollectionsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases
index ee10457..5212ca9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreJsr166TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreJsr166TestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreJsr166TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJsr166TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreJsr166TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreJsr166TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases
index e4096b5..b47599b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreLegacy22TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreLegacy22TestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreLegacy22TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreLegacy22TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreLegacy22TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases
index 6fa0e18..ca4fff5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOjTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreOjTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreOjTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOjTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOjTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreOjTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases
index 32a827d..16dd9c8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreOkHttpTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreOkHttpTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreOkHttpTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreOkHttpTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreOkHttpTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases
index c0f361e..05ed365 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases
index 9daf78e..7ebeff9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofBCTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreWycheproofBCTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreWycheproofBCTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofBCTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreWycheproofBCTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases
index 1f10be7..2b5814b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLibcoreWycheproofConscryptTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLibcoreWycheproofConscryptTestCases',
test_name='cheets_CTS_P.x86.CtsLibcoreWycheproofConscryptTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLibcoreWycheproofConscryptTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLibcoreWycheproofConscryptTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases
index ba2ae20..dc08acd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLiblogTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLiblogTestCases',
test_name='cheets_CTS_P.x86.CtsLiblogTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLiblogTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLiblogTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLiblogTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases
index af40f6e..c309179 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLocation2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLocation2TestCases',
test_name='cheets_CTS_P.x86.CtsLocation2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocation2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocation2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases
index 5b32763..7352fd7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLocationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLocationTestCases',
test_name='cheets_CTS_P.x86.CtsLocationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLocationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLocationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases
index c68c879..286569e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsLogdTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsLogdTestCases',
test_name='cheets_CTS_P.x86.CtsLogdTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLogdTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsLogdTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsLogdTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases
index bd05b26..a9b92bf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaBitstreamsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMediaBitstreamsTestCases',
test_name='cheets_CTS_P.x86.CtsMediaBitstreamsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaBitstreamsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaBitstreamsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaBitstreamsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases
index e475bf1..29eee38 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMediaHostTestCases',
test_name='cheets_CTS_P.x86.CtsMediaHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases
index 2dde42d..14bda28 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaStressTestCases
@@ -25,8 +25,8 @@
needs_push_media=True,
tag='x86.CtsMediaStressTestCases',
test_name='cheets_CTS_P.x86.CtsMediaStressTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaStressTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaStressTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases
index d412d4b..c867e48 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMediaTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsMediaTestCases',
test_name='cheets_CTS_P.x86.CtsMediaTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMediaTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMediaTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases
index a775de9..87ae9de 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMidiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMidiTestCases',
test_name='cheets_CTS_P.x86.CtsMidiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMidiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMidiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases
index 50c2ca1..368fc92 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingDebuggableTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMockingDebuggableTestCases',
test_name='cheets_CTS_P.x86.CtsMockingDebuggableTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingDebuggableTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMockingDebuggableTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases
index d89f760..3566cc5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMockingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMockingTestCases',
test_name='cheets_CTS_P.x86.CtsMockingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMockingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMockingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases
index 0a4bd64..ec75ecb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMonkeyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMonkeyTestCases',
test_name='cheets_CTS_P.x86.CtsMonkeyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMonkeyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMonkeyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMonkeyTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases
index 41bd100..110bdd5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMultiUserHostTestCases',
test_name='cheets_CTS_P.x86.CtsMultiUserHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMultiUserHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases
index 0c9bad8..9bbc33c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsMultiUserTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsMultiUserTestCases',
test_name='cheets_CTS_P.x86.CtsMultiUserTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsMultiUserTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsMultiUserTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases
index ce36eb0..ab1ecba 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNNAPITestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNNAPITestCases',
test_name='cheets_CTS_P.x86.CtsNNAPITestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNNAPITestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNNAPITestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNNAPITestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases
index 35f64cc..f980581 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeHardwareTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNativeHardwareTestCases',
test_name='cheets_CTS_P.x86.CtsNativeHardwareTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeHardwareTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeHardwareTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases
index d7135fe..b4d7f5f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaAAudioTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNativeMediaAAudioTestCases',
test_name='cheets_CTS_P.x86.CtsNativeMediaAAudioTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaAAudioTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaAAudioTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases
index 6f3184b..676808f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaSlTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNativeMediaSlTestCases',
test_name='cheets_CTS_P.x86.CtsNativeMediaSlTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaSlTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaSlTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaSlTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases
index 526fe88..6e82fc2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeMediaXaTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNativeMediaXaTestCases',
test_name='cheets_CTS_P.x86.CtsNativeMediaXaTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaXaTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeMediaXaTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeMediaXaTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases
index 5b502d8..794d198 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNativeNetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNativeNetTestCases',
test_name='cheets_CTS_P.x86.CtsNativeNetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeNetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNativeNetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNativeNetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases
index d85cfac..7353758 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNdefTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNdefTestCases',
test_name='cheets_CTS_P.x86.CtsNdefTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNdefTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNdefTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNdefTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases
index 62b7d0d..5998d41 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigAttributeTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigAttributeTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigAttributeTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigAttributeTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigAttributeTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
index e77654c..df74b5f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugDisabledTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigBasicDebugDisabledTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigBasicDebugDisabledTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugDisabledTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigBasicDebugDisabledTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
index e00a26b..56002c4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDebugEnabledTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigBasicDebugEnabledTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigBasicDebugEnabledTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDebugEnabledTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigBasicDebugEnabledTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
index 1d5546c..b8d3533 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigBasicDomainConfigTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigBasicDomainConfigTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigBasicDomainConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigBasicDomainConfigTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigBasicDomainConfigTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases
index c7e9d91..f394835 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigCleartextTrafficTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigCleartextTrafficTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigCleartextTrafficTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigCleartextTrafficTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigCleartextTrafficTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases
index 854d444..8d4d4ac 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigDownloadManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigDownloadManagerTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigDownloadManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigDownloadManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigDownloadManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases
index c4e322d..a4360a7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigInvalidPinTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigInvalidPinTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigInvalidPinTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigInvalidPinTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigInvalidPinTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
index 0fc5bed..b44edb2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigNestedDomainConfigTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigNestedDomainConfigTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigNestedDomainConfigTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigNestedDomainConfigTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigNestedDomainConfigTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases
index 162d7d4..2d12145 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigPrePCleartextTrafficTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigPrePCleartextTrafficTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigPrePCleartextTrafficTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigPrePCleartextTrafficTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigPrePCleartextTrafficTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases
index e855ae2..b9b9033 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecConfigResourcesSrcTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecConfigResourcesSrcTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecConfigResourcesSrcTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecConfigResourcesSrcTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecConfigResourcesSrcTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
index b5b0935..7052f70 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecPolicyUsesCleartextTrafficFalseTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficFalseTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecPolicyUsesCleartextTrafficFalseTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
index 33f2b87..93e7f26 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecPolicyUsesCleartextTrafficTrueTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficTrueTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecPolicyUsesCleartextTrafficTrueTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
index 50e4e66..24d722c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases',
test_name='cheets_CTS_P.x86.CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases
index ef55989..7c11d1d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsNetTestCases',
test_name='cheets_CTS_P.x86.CtsNetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22 b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22
index a460eb4..367cc55 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyApi22
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetTestCasesLegacyApi22',
test_name='cheets_CTS_P.x86.CtsNetTestCasesLegacyApi22',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyApi22', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCasesLegacyApi22',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22 b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22
index 64e6ce3..e1827ec 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsNetTestCasesLegacyPermission22
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsNetTestCasesLegacyPermission22',
test_name='cheets_CTS_P.x86.CtsNetTestCasesLegacyPermission22',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsNetTestCasesLegacyPermission22', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsNetTestCasesLegacyPermission22',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases
index a405476..6232383 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOmapiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOmapiTestCases',
test_name='cheets_CTS_P.x86.CtsOmapiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOmapiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOmapiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOmapiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases
index b9ef882..b772442 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGLTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOpenGLTestCases',
test_name='cheets_CTS_P.x86.CtsOpenGLTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGLTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOpenGLTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases
index 33317b5..a5b61e2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerf2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOpenGlPerf2TestCases',
test_name='cheets_CTS_P.x86.CtsOpenGlPerf2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerf2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerf2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOpenGlPerf2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases
index 8b9282a..ce99fe2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOpenGlPerfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOpenGlPerfTestCases',
test_name='cheets_CTS_P.x86.CtsOpenGlPerfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOpenGlPerfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOpenGlPerfTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases
index 3092cf4..2a7e2a2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOsHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOsHostTestCases',
test_name='cheets_CTS_P.x86.CtsOsHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOsHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases
index 568bd41..879b71d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsOsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsOsTestCases',
test_name='cheets_CTS_P.x86.CtsOsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsOsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsOsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases
index 7eef0eb..f6ddf11 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPdfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPdfTestCases',
test_name='cheets_CTS_P.x86.CtsPdfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPdfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPdfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPdfTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases
index a680698..a299037 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPerfettoTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPerfettoTestCases',
test_name='cheets_CTS_P.x86.CtsPerfettoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPerfettoTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPerfettoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases
index 42874f9..b450738 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPermission2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPermission2TestCases',
test_name='cheets_CTS_P.x86.CtsPermission2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermission2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermission2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases
index b431c05..e62267e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPermissionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPermissionTestCases',
test_name='cheets_CTS_P.x86.CtsPermissionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPermissionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPermissionTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases
index 7b96fa2..cbdb387 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPreference2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPreference2TestCases',
test_name='cheets_CTS_P.x86.CtsPreference2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreference2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreference2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases
index c054f3e..fa87a26 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPreferenceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPreferenceTestCases',
test_name='cheets_CTS_P.x86.CtsPreferenceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreferenceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPreferenceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPreferenceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases
index 59a9a3f..58dac8f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsPrintTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsPrintTestCases',
test_name='cheets_CTS_P.x86.CtsPrintTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsPrintTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsPrintTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases
index 76072bd..e8bc548 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsProtoTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsProtoTestCases',
test_name='cheets_CTS_P.x86.CtsProtoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProtoTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProtoTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsProtoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases
index 66c557a..059cedc 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsProviderTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsProviderTestCases',
test_name='cheets_CTS_P.x86.CtsProviderTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProviderTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsProviderTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsProviderTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases
index 97dadb1..4f620de 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptLegacyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsRenderscriptLegacyTestCases',
test_name='cheets_CTS_P.x86.CtsRenderscriptLegacyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptLegacyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRenderscriptLegacyTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases
index 8b496cc..ee789da 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRenderscriptTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsRenderscriptTestCases',
test_name='cheets_CTS_P.x86.CtsRenderscriptTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRenderscriptTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRenderscriptTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases
index a83c9ee..13d5772 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRsBlasTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsRsBlasTestCases',
test_name='cheets_CTS_P.x86.CtsRsBlasTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsBlasTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRsBlasTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases
index 60beda5..1c45dbd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsRsCppTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsRsCppTestCases',
test_name='cheets_CTS_P.x86.CtsRsCppTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsCppTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsRsCppTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsRsCppTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases
index daec1d2..8a45ea2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSampleDeviceTestCases',
test_name='cheets_CTS_P.x86.CtsSampleDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases
index a2e494d..fc18359 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSampleHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSampleHostTestCases',
test_name='cheets_CTS_P.x86.CtsSampleHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSampleHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSampleHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases
index efdbe43..749b4eb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSaxTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSaxTestCases',
test_name='cheets_CTS_P.x86.CtsSaxTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSaxTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSaxTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSaxTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases
index 9f62cc9..f5e5514 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSeccompHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSeccompHostTestCases',
test_name='cheets_CTS_P.x86.CtsSeccompHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSeccompHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSeccompHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSeccompHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1
index c4ab48e..bbd1649 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases1
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSecureElementAccessControlTestCases1',
test_name='cheets_CTS_P.x86.CtsSecureElementAccessControlTestCases1',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases1', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecureElementAccessControlTestCases1',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2
index 1bb282b..779473d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSecureElementAccessControlTestCases2',
test_name='cheets_CTS_P.x86.CtsSecureElementAccessControlTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecureElementAccessControlTestCases2',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3
index fe04ec0..5688513 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecureElementAccessControlTestCases3
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSecureElementAccessControlTestCases3',
test_name='cheets_CTS_P.x86.CtsSecureElementAccessControlTestCases3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecureElementAccessControlTestCases3',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases
index 394b239..d0fdd1b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityHostTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsSecurityHostTestCases',
test_name='cheets_CTS_P.x86.CtsSecurityHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecurityHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases
index 8e58a09..4718371 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSecurityTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsSecurityTestCases',
test_name='cheets_CTS_P.x86.CtsSecurityTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSecurityTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSecurityTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases
index 7f0cba4..6655593 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk25TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSelinuxTargetSdk25TestCases',
test_name='cheets_CTS_P.x86.CtsSelinuxTargetSdk25TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk25TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSelinuxTargetSdk25TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases
index f72dc5a..036b7bd 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdk27TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSelinuxTargetSdk27TestCases',
test_name='cheets_CTS_P.x86.CtsSelinuxTargetSdk27TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdk27TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSelinuxTargetSdk27TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases
index 75cac38..6ae48da 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSelinuxTargetSdkCurrentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSelinuxTargetSdkCurrentTestCases',
test_name='cheets_CTS_P.x86.CtsSelinuxTargetSdkCurrentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSelinuxTargetSdkCurrentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSelinuxTargetSdkCurrentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases
index 6bed495..57ca2d1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSensorTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSensorTestCases',
test_name='cheets_CTS_P.x86.CtsSensorTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSensorTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSensorTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases
index aec508e..f2099d6 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsShortcutHostTestCases',
test_name='cheets_CTS_P.x86.CtsShortcutHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsShortcutHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases
index 075d28c..e8fc482 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsShortcutManagerTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsShortcutManagerTestCases',
test_name='cheets_CTS_P.x86.CtsShortcutManagerTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutManagerTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsShortcutManagerTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsShortcutManagerTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases
index 37784a6..11a9889 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleCpuTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSimpleCpuTestCases',
test_name='cheets_CTS_P.x86.CtsSimpleCpuTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleCpuTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleCpuTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSimpleCpuTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases
index 083d17c..354b4de 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSimpleperfTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSimpleperfTestCases',
test_name='cheets_CTS_P.x86.CtsSimpleperfTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleperfTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSimpleperfTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSimpleperfTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases
index 4e0876a..e4bb687 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSkQPTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSkQPTestCases',
test_name='cheets_CTS_P.x86.CtsSkQPTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSkQPTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSkQPTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSkQPTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases
index ad2fda1..30a56e5 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSliceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSliceTestCases',
test_name='cheets_CTS_P.x86.CtsSliceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSliceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSliceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSliceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases
index 5c63787..5c426e2 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSpeechTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSpeechTestCases',
test_name='cheets_CTS_P.x86.CtsSpeechTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSpeechTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSpeechTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSpeechTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases
index 87ad876..5baa160 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsStatsdHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsStatsdHostTestCases',
test_name='cheets_CTS_P.x86.CtsStatsdHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsStatsdHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsStatsdHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsStatsdHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases
index e2be349..9fe6b1f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSustainedPerformanceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSustainedPerformanceHostTestCases',
test_name='cheets_CTS_P.x86.CtsSustainedPerformanceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSustainedPerformanceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSustainedPerformanceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases
index 7dba56f..205b8c9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncAccountAccessOtherCertTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSyncAccountAccessOtherCertTestCases',
test_name='cheets_CTS_P.x86.CtsSyncAccountAccessOtherCertTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncAccountAccessOtherCertTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSyncAccountAccessOtherCertTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases
index 0f6afcf..9c373d3 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncContentHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSyncContentHostTestCases',
test_name='cheets_CTS_P.x86.CtsSyncContentHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncContentHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncContentHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSyncContentHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases
index f921ba5..7cd4f1c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSyncManagerTestsCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSyncManagerTestsCases',
test_name='cheets_CTS_P.x86.CtsSyncManagerTestsCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncManagerTestsCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSyncManagerTestsCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSyncManagerTestsCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases
index 0ca9cdb..98983ce 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiAnnotationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSystemApiAnnotationTestCases',
test_name='cheets_CTS_P.x86.CtsSystemApiAnnotationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiAnnotationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemApiAnnotationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases
index cbe3ddc..b4177ee 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemApiSignatureTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSystemApiSignatureTestCases',
test_name='cheets_CTS_P.x86.CtsSystemApiSignatureTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiSignatureTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemApiSignatureTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemApiSignatureTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases
index 1945481..6b7f68c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemIntentTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSystemIntentTestCases',
test_name='cheets_CTS_P.x86.CtsSystemIntentTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemIntentTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemIntentTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemIntentTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases
index 1ec52fa..cb42ac1 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSystemUiHostTestCases',
test_name='cheets_CTS_P.x86.CtsSystemUiHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemUiHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases
index 71b616a..f3ffd72 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsSystemUiTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsSystemUiTestCases',
test_name='cheets_CTS_P.x86.CtsSystemUiTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsSystemUiTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsSystemUiTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases
index e546043..dc64f27 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTelecomTestCases',
test_name='cheets_CTS_P.x86.CtsTelecomTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelecomTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2
index 6670a02..9e1174b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTelecomTestCases2',
test_name='cheets_CTS_P.x86.CtsTelecomTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelecomTestCases2',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3 b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3
index d888b25..37b4f20 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelecomTestCases3
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTelecomTestCases3',
test_name='cheets_CTS_P.x86.CtsTelecomTestCases3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases3', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelecomTestCases3', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelecomTestCases3',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases
index 9cc68da..d5e3cba 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephony2TestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTelephony2TestCases',
test_name='cheets_CTS_P.x86.CtsTelephony2TestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephony2TestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelephony2TestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases
index 7dbc7ad..cb7e7f4 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTelephonyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTelephonyTestCases',
test_name='cheets_CTS_P.x86.CtsTelephonyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephonyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTelephonyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTelephonyTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases
index c7b7809..d9eba92 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTextTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTextTestCases',
test_name='cheets_CTS_P.x86.CtsTextTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTextTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTextTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases
index aaf84f3..d27326b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsThemeDeviceTestCases',
test_name='cheets_CTS_P.x86.CtsThemeDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsThemeDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases
index b1f229e..da36d5a 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsThemeHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsThemeHostTestCases',
test_name='cheets_CTS_P.x86.CtsThemeHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsThemeHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsThemeHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases
index b8ce079..d9859fa 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsToastLegacyTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsToastLegacyTestCases',
test_name='cheets_CTS_P.x86.CtsToastLegacyTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastLegacyTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsToastLegacyTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases
index be73ba1..3810570 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsToastTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsToastTestCases',
test_name='cheets_CTS_P.x86.CtsToastTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsToastTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsToastTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases
index 1ef9fbc..6cfb5be 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTransitionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTransitionTestCases',
test_name='cheets_CTS_P.x86.CtsTransitionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTransitionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTransitionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTransitionTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases
index 0cc8bab..54ee04d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTrustedVoiceHostTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTrustedVoiceHostTestCases',
test_name='cheets_CTS_P.x86.CtsTrustedVoiceHostTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTrustedVoiceHostTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTrustedVoiceHostTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases
index 3259a77..8553b63 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTvProviderTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTvProviderTestCases',
test_name='cheets_CTS_P.x86.CtsTvProviderTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvProviderTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTvProviderTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases
index b0de7dd..edff22b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsTvTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsTvTestCases',
test_name='cheets_CTS_P.x86.CtsTvTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsTvTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsTvTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases
index 3af077d..a90d80c 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUiAutomationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUiAutomationTestCases',
test_name='cheets_CTS_P.x86.CtsUiAutomationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiAutomationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiAutomationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases
index 36cbf1f..8ea6753 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUiDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUiDeviceTestCases',
test_name='cheets_CTS_P.x86.CtsUiDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases
index f9c2ae6..f7d70ae 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUiRenderingTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUiRenderingTestCases',
test_name='cheets_CTS_P.x86.CtsUiRenderingTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiRenderingTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUiRenderingTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUiRenderingTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases
index 4128137..a51be7f 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUidIsolationTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUidIsolationTestCases',
test_name='cheets_CTS_P.x86.CtsUidIsolationTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUidIsolationTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUidIsolationTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUnofficialApisUsageTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUnofficialApisUsageTestCases
index 533529f..ed379bf 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUnofficialApisUsageTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUnofficialApisUsageTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUnofficialApisUsageTestCases',
test_name='cheets_CTS_P.x86.CtsUnofficialApisUsageTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUnofficialApisUsageTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUnofficialApisUsageTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUnofficialApisUsageTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases
index 8873c15..e9eb153 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUsageStatsTestCases
@@ -25,8 +25,8 @@
needs_push_media=False,
tag='x86.CtsUsageStatsTestCases',
test_name='cheets_CTS_P.x86.CtsUsageStatsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsageStatsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsageStatsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests b/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests
index ecfb814..c02aa51 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUsbTests
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUsbTests',
test_name='cheets_CTS_P.x86.CtsUsbTests',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUsbTests', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUsbTests',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases
index dcc6398..87cb034 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsUtilTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsUtilTestCases',
test_name='cheets_CTS_P.x86.CtsUtilTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUtilTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsUtilTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsUtilTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases
index 29e7ad1..8b1941d 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVideoTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsVideoTestCases',
test_name='cheets_CTS_P.x86.CtsVideoTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVideoTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVideoTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVideoTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases
index 10177ca..beff8ec 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsViewTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsViewTestCases',
test_name='cheets_CTS_P.x86.CtsViewTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsViewTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsViewTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases
index 71d27f2..9f4f478 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVmTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsVmTestCases',
test_name='cheets_CTS_P.x86.CtsVmTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVmTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVmTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases
index a234dc5..7fb95df 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceInteractionTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsVoiceInteractionTestCases',
test_name='cheets_CTS_P.x86.CtsVoiceInteractionTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceInteractionTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVoiceInteractionTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases
index 8ef3dde..b282993 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVoiceSettingsTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsVoiceSettingsTestCases',
test_name='cheets_CTS_P.x86.CtsVoiceSettingsTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceSettingsTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVoiceSettingsTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVoiceSettingsTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases
index 50dab39..23b5a4b 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsVrTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsVrTestCases',
test_name='cheets_CTS_P.x86.CtsVrTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVrTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsVrTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsVrTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases
index 9804414..97c74ec 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWebkitTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWebkitTestCases',
test_name='cheets_CTS_P.x86.CtsWebkitTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWebkitTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWebkitTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWebkitTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases
index f1ba8fb..b25923e 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWidgetTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWidgetTestCases',
test_name='cheets_CTS_P.x86.CtsWidgetTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWidgetTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWidgetTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases
index f0e785d..7ee8914 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWindowManagerDeviceTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWindowManagerDeviceTestCases',
test_name='cheets_CTS_P.x86.CtsWindowManagerDeviceTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWindowManagerDeviceTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWindowManagerDeviceTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases
index 88b4218..e1d70c8 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapNoWrapTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWrapNoWrapTestCases',
test_name='cheets_CTS_P.x86.CtsWrapNoWrapTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapNoWrapTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapNoWrapTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases
index 94671ff..d365edb 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugMallocDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWrapWrapDebugMallocDebugTestCases',
test_name='cheets_CTS_P.x86.CtsWrapWrapDebugMallocDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugMallocDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapWrapDebugMallocDebugTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases
index ad8022d..1cf15c9 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWrapWrapDebugTestCases',
test_name='cheets_CTS_P.x86.CtsWrapWrapDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapWrapDebugTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases
index 1374af7..d64b655 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases
+++ b/server/site_tests/cheets_CTS_P/control.x86.CtsWrapWrapNoDebugTestCases
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.CtsWrapWrapNoDebugTestCases',
test_name='cheets_CTS_P.x86.CtsWrapWrapNoDebugTestCases',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'CtsWrapWrapNoDebugTestCases', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='CtsWrapWrapNoDebugTestCases',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api b/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api
index 4e4a2e0..f6c34ea 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api
+++ b/server/site_tests/cheets_CTS_P/control.x86.cts-system-all.api
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.cts-system-all.api',
test_name='cheets_CTS_P.x86.cts-system-all.api',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'cts-system-all.api', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'cts-system-all.api', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='cts-system-all.api',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1 b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1
index 6698acb..2067aff 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1
+++ b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases1
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.signed-CtsSecureElementAccessControlTestCases1',
test_name='cheets_CTS_P.x86.signed-CtsSecureElementAccessControlTestCases1',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases1', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='signed-CtsSecureElementAccessControlTestCases1',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2 b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2
index a6748a2..7336fad 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2
+++ b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases2
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.signed-CtsSecureElementAccessControlTestCases2',
test_name='cheets_CTS_P.x86.signed-CtsSecureElementAccessControlTestCases2',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases2', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='signed-CtsSecureElementAccessControlTestCases2',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3 b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3
index 6fb48e1..0de82b7 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3
+++ b/server/site_tests/cheets_CTS_P/control.x86.signed-CtsSecureElementAccessControlTestCases3
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.signed-CtsSecureElementAccessControlTestCases3',
test_name='cheets_CTS_P.x86.signed-CtsSecureElementAccessControlTestCases3',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'signed-CtsSecureElementAccessControlTestCases3', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='signed-CtsSecureElementAccessControlTestCases3',
target_plan=None,
bundle='x86',
diff --git a/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf b/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf
index 0131e7c..98f1383 100644
--- a/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf
+++ b/server/site_tests/cheets_CTS_P/control.x86.vm-tests-tf
@@ -24,8 +24,8 @@
needs_push_media=False,
tag='x86.vm-tests-tf',
test_name='cheets_CTS_P.x86.vm-tests-tf',
- run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'vm-tests-tf', '--precondition-arg', 'skip-media-download', '--logcat-on-failure'],
- retry_template=['run', 'commandAndExit', 'retry', '--precondition-arg', 'skip-media-download', '--retry', '{session_id}'],
+ run_template=['run', 'commandAndExit', 'cts', '--include-filter', 'vm-tests-tf', '--logcat-on-failure'],
+ retry_template=['run', 'commandAndExit', 'retry', '--retry', '{session_id}'],
target_module='vm-tests-tf',
target_plan=None,
bundle='x86',