aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests
diff options
context:
space:
mode:
authorGravatar Matt Kwong <mattkwong@google.com>2017-08-10 13:39:21 -0700
committerGravatar Matt Kwong <mattkwong@google.com>2017-08-16 10:13:46 -0700
commitc5fd890b1331834a681a8ba61bb12518548588dc (patch)
tree2fec6b0efa4e419df837bef7b80824147ecb7a90 /tools/run_tests
parente60c0f82b55310efae040534541f5a6acec28aba (diff)
Don't rerun flakes when uploading results to BQ
Diffstat (limited to 'tools/run_tests')
-rwxr-xr-xtools/run_tests/run_tests.py6
-rwxr-xr-xtools/run_tests/run_tests_matrix.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index f90c522326..8c23158a52 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1274,12 +1274,12 @@ argp.add_argument('--bq_result_table',
type=str,
nargs='?',
help='Upload test results to a specified BQ table.')
-argp.add_argument('--auto_set_flakes', default=True, type=bool,
- help='Set flakiness data from historic data')
+argp.add_argument('--disable_auto_set_flakes', default=False, const=True, action='store_const',
+ help='Disable rerunning historically flaky tests')
args = argp.parse_args()
flaky_tests = set()
-if args.auto_set_flakes:
+if not args.disable_auto_set_flakes:
try:
flaky_tests = set(get_flaky_tests())
except:
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 6fe1609f1c..04e2a70d28 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -411,6 +411,7 @@ if __name__ == "__main__":
extra_args.append('--bq_result_table')
extra_args.append('%s' % args.bq_result_table)
extra_args.append('--measure_cpu_costs')
+ extra_args.append('--disable_auto_set_flakes')
all_jobs = _create_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs) + \
_create_portability_test_jobs(extra_args=extra_args, inner_jobs=args.inner_jobs)