commit e07bff58e13cf8fcaba9f33c674412216f655639
author Kuang-che Wu <kcwu@chromium.org> Tue Oct 29 20:50:45 2019 +0800
committer chrome-bot <chrome-bot@chromium.org> Tue Oct 29 23:34:02 2019 -0700
tree f5a266ca78e8b5a1802cc5290fe00aad622aa080
parent 72b5a577dbd80913fb93a9fd179c48cd66908c3e

bisect-kit: CTS/GTS tests always run once (no retry)

BUG=b:143047353
TEST=run bisect for b:132671748, the test passed after retry

Change-Id: I8584b9e9dbf5d875179968218be5f92f42894bff
Reviewed-on: https://chromium-review.googlesource.com/1886557
Tested-by: Kuang-che Wu <kcwu@chromium.org>
Commit-Ready: Kuang-che Wu <kcwu@chromium.org>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Chung-yih Wang <cywang@chromium.org>
Reviewed-by: Zheng-Jie Chang <zjchang@chromium.org>

eval_cros_autotest.py

diff --git a/eval_cros_autotest.py b/eval_cros_autotest.py
index 8de9371..25df876 100755
--- a/eval_cros_autotest.py
+++ b/eval_cros_autotest.py
@@ -112,8 +112,6 @@
       help='CTS/GTS test name, like '
       '"android.hardware.cts.CameraTest#testDisplayOrientation"')
   group.add_argument('--cts_timeout', type=float, help='timeout, in seconds')
-  group.add_argument(
-      '--cts_runonce', action='store_true', help='run test only once')
 
   return parser
 
@@ -274,7 +272,7 @@
 
   is_cts = (
       opts.cts_revision or opts.cts_abi or opts.cts_prefix or opts.cts_module or
-      opts.cts_test or opts.cts_runonce or opts.cts_timeout)
+      opts.cts_test or opts.cts_timeout)
   if is_cts:
     if opts.test_name or opts.metric or opts.args:
       parser.error(
@@ -284,13 +282,12 @@
     if not opts.cts_module:
       parser.error('--cts_module should be specified for CTS/GTS tests')
     opts.test_name = '%s.tradefed-run-test' % opts.cts_prefix
-    opts.args = 'module=%s test=%s' % (opts.cts_module, opts.cts_test)
+    opts.args = 'module=%s test=%s max_retry=0' % (opts.cts_module,
+                                                   opts.cts_test)
     if opts.cts_revision:
       opts.args += ' revision=%s' % opts.cts_revision
     if opts.cts_abi:
       opts.args += ' abi=%s' % opts.cts_abi
-    if opts.cts_runonce:
-      opts.args += ' max_retry=0'
     if opts.cts_timeout:
       opts.args += ' timeout=%s' % opts.cts_timeout
   else: