aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Muxi Yan <muxi@users.noreply.github.com>2018-02-26 15:03:57 -0800
committerGravatar GitHub <noreply@github.com>2018-02-26 15:03:57 -0800
commit0dc7c5996ce5091a96632919a3e3befe351b44d0 (patch)
tree2b1c44478b0e1bf0eaf7b1afc093499bda4ab419
parent200dffc822bb8383ef325b75861eff21f911e98e (diff)
parentb94f3b37843f1ebe176fbafcb67bc3c546c8afa7 (diff)
Merge pull request #14528 from grpc/objc-higher-timeout
Use higher timeout for objc tests
-rwxr-xr-xtools/run_tests/run_tests_matrix.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/run_tests/run_tests_matrix.py b/tools/run_tests/run_tests_matrix.py
index 433137a9bc..1c99e794a9 100755
--- a/tools/run_tests/run_tests_matrix.py
+++ b/tools/run_tests/run_tests_matrix.py
@@ -37,6 +37,9 @@ _CPP_RUNTESTS_TIMEOUT = 4 * 60 * 60
# C++ TSAN takes longer than other sanitizers
_CPP_TSAN_RUNTESTS_TIMEOUT = 8 * 60 * 60
+# Set timeout high for ObjC for Cocoapods to install pods
+_OBJC_RUNTESTS_TIMEOUT = 90 * 60
+
# Number of jobs assigned to each run_tests.py instance
_DEFAULT_INNER_JOBS = 2
@@ -213,7 +216,8 @@ def _create_test_jobs(extra_args=[], inner_jobs=_DEFAULT_INNER_JOBS):
platforms=['macos'],
labels=['basictests', 'multilang'],
extra_args=extra_args,
- inner_jobs=inner_jobs)
+ inner_jobs=inner_jobs,
+ timeout_seconds=_OBJC_RUNTESTS_TIMEOUT)
# sanitizers
test_jobs += _generate_jobs(