Skip to content
Snippets Groups Projects
Commit e404de63 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #5308 from murgatroid99/test_timeouts 

Increase Node's per-test timeout and Ruby's overall test timeout
parents c15cd723 7d243df8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/run_tests/run_node.bat
+ 1
− 1
View file @ e404de63
...@@ -29,4 +29,4 @@ ...@@ -29,4 +29,4 @@
set JUNIT_REPORT_PATH=src\node\reports.xml set JUNIT_REPORT_PATH=src\node\reports.xml
set JUNIT_REPORT_STACK=1 set JUNIT_REPORT_STACK=1
.\node_modules\.bin\mocha.cmd --reporter mocha-jenkins-reporter src\node\test .\node_modules\.bin\mocha.cmd --reporter mocha-jenkins-reporter --timeout 8000 src\node\test
\ No newline at end of file \ No newline at end of file
tools/run_tests/run_node.sh
+ 7
− 2
View file @ e404de63
...@@ -41,10 +41,13 @@ cd $(dirname $0)/../.. ...@@ -41,10 +41,13 @@ cd $(dirname $0)/../..
root=`pwd` root=`pwd`
test_directory='src/node/test'
timeout=8000
if [ "$CONFIG" = "gcov" ] if [ "$CONFIG" = "gcov" ]
then then
./node_modules/.bin/istanbul cover --dir reports/node_coverage \ ./node_modules/.bin/istanbul cover --dir reports/node_coverage \
-x **/interop/* ./node_modules/.bin/_mocha -- --timeout 8000 src/node/test -x **/interop/* ./node_modules/.bin/_mocha -- --timeout $timeout $test_directory
cd build cd build
gcov Release/obj.target/grpc/ext/*.o gcov Release/obj.target/grpc/ext/*.o
lcov --base-directory . --directory . -c -o coverage.info lcov --base-directory . --directory . -c -o coverage.info
...@@ -55,5 +58,7 @@ then ...@@ -55,5 +58,7 @@ then
echo '<html><head><meta http-equiv="refresh" content="0;URL=lcov-report/index.html"></head></html>' > \ echo '<html><head><meta http-equiv="refresh" content="0;URL=lcov-report/index.html"></head></html>' > \
../reports/node_coverage/index.html ../reports/node_coverage/index.html
else else
JUNIT_REPORT_PATH=src/node/reports.xml JUNIT_REPORT_STACK=1 ./node_modules/.bin/mocha --reporter mocha-jenkins-reporter src/node/test JUNIT_REPORT_PATH=src/node/reports.xml JUNIT_REPORT_STACK=1 \
./node_modules/.bin/mocha --timeout $timeout \
--reporter mocha-jenkins-reporter $test_directory
fi fi
tools/run_tests/run_tests.py
+ 2
− 2
View file @ e404de63
...@@ -334,13 +334,14 @@ class RubyLanguage(object): ...@@ -334,13 +334,14 @@ class RubyLanguage(object):
def test_specs(self, config, args): def test_specs(self, config, args):
return [config.job_spec(['tools/run_tests/run_ruby.sh'], None, return [config.job_spec(['tools/run_tests/run_ruby.sh'], None,
timeout_seconds=10*60,
environ=_FORCE_ENVIRON_FOR_WRAPPERS)] environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def pre_build_steps(self): def pre_build_steps(self):
return [['tools/run_tests/pre_build_ruby.sh']] return [['tools/run_tests/pre_build_ruby.sh']]
def make_targets(self, test_regex): def make_targets(self, test_regex):
return ['static_c'] return []
def make_options(self): def make_options(self):
return [] return []
...@@ -1197,4 +1198,3 @@ else: ...@@ -1197,4 +1198,3 @@ else:
if BuildAndRunError.POST_TEST in errors: if BuildAndRunError.POST_TEST in errors:
exit_code |= 4 exit_code |= 4
sys.exit(exit_code) sys.exit(exit_code)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment