From db0d23466a4212ada2822111d63f1c962b473c14 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 5 Aug 2015 07:47:35 -0700 Subject: [PATCH 1/2] Give make a long timeout, tests a small one, and interop a slightly longer one --- tools/run_tests/jobset.py | 2 +- tools/run_tests/run_interops.py | 5 ++++- tools/run_tests/run_tests.py | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index b7e00892694..1a5144c8ff9 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -131,7 +131,7 @@ class JobSpec(object): """Specifies what to run for a job.""" def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, - cwd=None, shell=False, timeout_seconds=900): + cwd=None, shell=False, timeout_seconds=300): """ Arguments: cmdline: a list of arguments to pass as the command line diff --git a/tools/run_tests/run_interops.py b/tools/run_tests/run_interops.py index 1cf268526dc..190043106f2 100755 --- a/tools/run_tests/run_interops.py +++ b/tools/run_tests/run_interops.py @@ -19,7 +19,10 @@ jobs = [] jobNumber = 0 for lang in args.language: for test in _TESTS: - test_job = jobset.JobSpec(cmdline=['tools/run_tests/run_interops_test.sh', '%s' % lang, '%s' % test], shortname=test) + test_job = jobset.JobSpec( + cmdline=['tools/run_tests/run_interops_test.sh', '%s' % lang, '%s' % test], + shortname=test, + timeout_seconds=900) jobs.append(test_job) jobNumber+=1 diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 28512a847c5..391059ad0c6 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -463,7 +463,8 @@ else: '-j', '%d' % (multiprocessing.cpu_count() + 1), 'EXTRA_DEFINES=GRPC_TEST_SLOWDOWN_MACHINE_FACTOR=%f' % args.slowdown, - 'CONFIG=%s' % cfg] + targets) + 'CONFIG=%s' % cfg] + targets, + timeout_seconds=30*60) build_steps = [make_jobspec(cfg, list(set(itertools.chain.from_iterable( From 7f8f80ff6f4867108541ca13f57915694a8faced Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 5 Aug 2015 12:16:46 -0700 Subject: [PATCH 2/2] Bikeshedding --- tools/run_tests/jobset.py | 2 +- tools/run_tests/run_interops.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index 1a5144c8ff9..cf98bf9490c 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -131,7 +131,7 @@ class JobSpec(object): """Specifies what to run for a job.""" def __init__(self, cmdline, shortname=None, environ=None, hash_targets=None, - cwd=None, shell=False, timeout_seconds=300): + cwd=None, shell=False, timeout_seconds=5*60): """ Arguments: cmdline: a list of arguments to pass as the command line diff --git a/tools/run_tests/run_interops.py b/tools/run_tests/run_interops.py index 190043106f2..c2b9c7a70e8 100755 --- a/tools/run_tests/run_interops.py +++ b/tools/run_tests/run_interops.py @@ -22,7 +22,7 @@ for lang in args.language: test_job = jobset.JobSpec( cmdline=['tools/run_tests/run_interops_test.sh', '%s' % lang, '%s' % test], shortname=test, - timeout_seconds=900) + timeout_seconds=15*60) jobs.append(test_job) jobNumber+=1