diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-08-02 17:12:00 -0700 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-08-02 17:12:00 -0700 |
| commit | 34989fdaae7cf5d214529a49563ea11fc8860a87 (patch) | |
| tree | 7ca1e0927464dc3a222e1ba5e125e7a8b6064c81 /tools/run_tests/run_tests.py | |
| parent | 8c8266cc430eb238021a6598b362436e6adc6ee6 (diff) | |
| parent | 4f68ecf665433933b0ef1f0a3df12b1590646a90 (diff) | |
Merge branch 'master' into fix_alarm
Diffstat (limited to 'tools/run_tests/run_tests.py')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 50eed6256c..106c7e0699 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -144,7 +144,7 @@ class Config(object): cpu_cost=cpu_cost, timeout_seconds=(self.timeout_multiplier * timeout_seconds if timeout_seconds else None), flake_retries=5 if flaky or args.allow_flakes else 0, - timeout_retries=3 if args.allow_flakes else 0) + timeout_retries=3 if flaky or args.allow_flakes else 0) def get_c_tests(travis, test_lang) : |