Merge pull request #15180 from jtattermusch/run_tests_auto_set_flakes_optin
run_tests.py --auto_set_flakes should be disabled by default
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 6fb0f89..0c270fa 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1420,16 +1420,18 @@
nargs='?',
help='Upload test results to a specified BQ table.')
argp.add_argument(
- '--disable_auto_set_flakes',
+ '--auto_set_flakes',
default=False,
const=True,
action='store_const',
- help='Disable rerunning historically flaky tests')
+ help=
+ 'Allow repeated runs for tests that have been failing recently (based on BQ historical data).'
+)
args = argp.parse_args()
flaky_tests = set()
shortname_to_cpu = {}
-if not args.disable_auto_set_flakes:
+if args.auto_set_flakes:
try:
for test in get_bqtest_data():
if test.flaky: flaky_tests.add(test.name)
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 85f91b0..64d80ab 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -529,7 +529,6 @@
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)