Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

test timeouts eliminated by mistake

Browse Source
pull/9161/head
Jan Tattermusch 8 years ago
parent 2cf4f35a38
commit fffb2676b5
1 changed files with 5 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      tools/run_tests/run_tests.py

13
tools/run_tests/run_tests.py
Unescape View File

@ -382,10 +382,9 @@ class NodeLanguage(object):
def test_specs(self): def test_specs(self):
if self.platform == 'windows': if self.platform == 'windows':
return [self.config.job_spec(['tools\\run_tests\\run_node.bat'], None)] return [self.config.job_spec(['tools\\run_tests\\run_node.bat'])]
else: else:
return [self.config.job_spec(['tools/run_tests/run_node.sh', self.node_version], return [self.config.job_spec(['tools/run_tests/run_node.sh', self.node_version],
None,
environ=_FORCE_ENVIRON_FOR_WRAPPERS)] environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def pre_build_steps(self): def pre_build_steps(self):
@ -427,7 +426,7 @@ class PhpLanguage(object):
_check_compiler(self.args.compiler, ['default']) _check_compiler(self.args.compiler, ['default'])
def test_specs(self): def test_specs(self):
return [self.config.job_spec(['src/php/bin/run_tests.sh'], None, return [self.config.job_spec(['src/php/bin/run_tests.sh'],
environ=_FORCE_ENVIRON_FOR_WRAPPERS)] environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def pre_build_steps(self): def pre_build_steps(self):
@ -463,7 +462,7 @@ class Php7Language(object):
_check_compiler(self.args.compiler, ['default']) _check_compiler(self.args.compiler, ['default'])
def test_specs(self): def test_specs(self):
return [self.config.job_spec(['src/php/bin/run_tests.sh'], None, return [self.config.job_spec(['src/php/bin/run_tests.sh'],
environ=_FORCE_ENVIRON_FOR_WRAPPERS)] environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def pre_build_steps(self): def pre_build_steps(self):
@ -702,7 +701,6 @@ class CSharpLanguage(object):
for test in tests_by_assembly[assembly]: for test in tests_by_assembly[assembly]:
cmdline = runtime_cmd + [assembly_file, '--test=%s' % test] + nunit_args cmdline = runtime_cmd + [assembly_file, '--test=%s' % test] + nunit_args
specs.append(self.config.job_spec(cmdline, specs.append(self.config.job_spec(cmdline,
None,
shortname='csharp.%s' % test, shortname='csharp.%s' % test,
environ=_FORCE_ENVIRON_FOR_WRAPPERS)) environ=_FORCE_ENVIRON_FOR_WRAPPERS))
else: else:
@ -720,7 +718,6 @@ class CSharpLanguage(object):
# to prevent problems with registering the profiler. # to prevent problems with registering the profiler.
run_exclusive = 1000000 run_exclusive = 1000000
specs.append(self.config.job_spec(cmdline, specs.append(self.config.job_spec(cmdline,
None,
shortname='csharp.coverage.%s' % assembly, shortname='csharp.coverage.%s' % assembly,
cpu_cost=run_exclusive, cpu_cost=run_exclusive,
environ=_FORCE_ENVIRON_FOR_WRAPPERS)) environ=_FORCE_ENVIRON_FOR_WRAPPERS))
@ -779,7 +776,7 @@ class ObjCLanguage(object):
def test_specs(self): def test_specs(self):
return [ return [
self.config.job_spec(['src/objective-c/tests/run_tests.sh'], self.config.job_spec(['src/objective-c/tests/run_tests.sh'],
timeout_seconds=None, timeout_seconds=60*60,
shortname='objc-tests', shortname='objc-tests',
environ=_FORCE_ENVIRON_FOR_WRAPPERS), environ=_FORCE_ENVIRON_FOR_WRAPPERS),
self.config.job_spec(['src/objective-c/tests/build_example_test.sh'], self.config.job_spec(['src/objective-c/tests/build_example_test.sh'],
@ -824,7 +821,7 @@ class Sanity(object):
import yaml import yaml
with open('tools/run_tests/sanity/sanity_tests.yaml', 'r') as f: with open('tools/run_tests/sanity/sanity_tests.yaml', 'r') as f:
return [self.config.job_spec(cmd['script'].split(), return [self.config.job_spec(cmd['script'].split(),
timeout_seconds=None, environ={'TEST': 'true'}, timeout_seconds=30*60, environ={'TEST': 'true'},
cpu_cost=cmd.get('cpu_cost', 1)) cpu_cost=cmd.get('cpu_cost', 1))
for cmd in yaml.load(f)] for cmd in yaml.load(f)]

Write Preview
Loading…
Cancel
Save