Fix repeat and retry-limit arguments to run_web_tests.py.
Specify each if a value is supplied, even if it's zero.
Fix the passthrough of the --isolated-script-test-launcher-retry-limit
flag.
Bug: 922808
Change-Id: I8a2137bee8395208c5194e7cbf7a5609723cfb93
Reviewed-on: https://chromium-review.googlesource.com/c/1448555
Commit-Queue: Kenneth Russell <[email protected]>
Commit-Queue: Chan Li <[email protected]>
Auto-Submit: Kenneth Russell <[email protected]>
Reviewed-by: Chan Li <[email protected]>
Cr-Commit-Position: refs/heads/master@{#628137}diff --git a/testing/scripts/common.py b/testing/scripts/common.py
index 566d2e3b..1e60d71 100644
--- a/testing/scripts/common.py
+++ b/testing/scripts/common.py
@@ -300,12 +300,12 @@
self.options.isolated_script_test_filter)
# Augment test repeat if needed
- if self.options.isolated_script_test_repeat:
+ if self.options.isolated_script_test_repeat is not None:
isolated_script_cmd += self.generate_test_repeat_args(
self.options.isolated_script_test_repeat)
# Augment test launcher retry limit args if needed
- if self.options.isolated_script_test_launcher_retry_limit:
+ if self.options.isolated_script_test_launcher_retry_limit is not None:
isolated_script_cmd += self.generate_test_launcher_retry_limit_args(
self.options.isolated_script_test_launcher_retry_limit)
diff --git a/testing/scripts/run_isolated_script_test.py b/testing/scripts/run_isolated_script_test.py
index ea5e54f..733de14b 100755
--- a/testing/scripts/run_isolated_script_test.py
+++ b/testing/scripts/run_isolated_script_test.py
@@ -76,7 +76,7 @@
return ['--isolated-script-test-output=%s' % output]
def generate_test_launcher_retry_limit_args(self, retry_limit):
- return ['--isolated-script-test-retry-limit=%d' % retry_limit]
+ return ['--isolated-script-test-launcher-retry-limit=%d' % retry_limit]
def generate_test_repeat_args(self, repeat_count):
return ['--isolated-script-test-repeat=%d' % repeat_count]
