habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for jenkins tests

Browse Source
This commit is contained in:
Spencer Alger
2014-01-15 15:23:20 -07:00
parent 17e8596b52
commit fb4638ecc8
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/ci.sh
View File

@ -56,13 +56,9 @@ fi
if [[ "$NODE_UNIT" != "0" ]]; then if [[ "$NODE_UNIT" != "0" ]]; then
group "start:unit_tests" group "start:unit_tests"
if [[ -n "$JENKINS" ]]; then if [[ -n "$JENKINS" ]]; then
MOCHA_EXE="./node_modules/.bin/mocha test/unit/test_*.js \ MOCHA_EXE="./node_modules/.bin/mocha test/unit/test_*.js --reporter ../../../test/utils/jenkins-reporter.js"
--require should \
--reporter ../../../test/utils/jenkins-reporter.js"
echo "\$ $MOCHA_EXE" echo "\$ $MOCHA_EXE"
$MOCHA_EXE 2> test/junit-node-unit.xml
$MOCHA_EXE
else else
grunt_ jshint mochacov:unit grunt_ jshint mochacov:unit
fi fi
@ -92,13 +88,12 @@ if [[ "$NODE_INTEGRATION" != "0" ]]; then
fi fi
MOCHA_EXE="./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js \ MOCHA_EXE="./node_modules/.bin/mocha test/integration/yaml_suite/index${BRANCH_SUFFIX}.js \
--require should \
--host localhost \ --host localhost \
--port $ES_PORT \ --port $ES_PORT \
--reporter ../../../test/utils/jenkins-reporter.js" --reporter ../../../test/utils/jenkins-reporter.js"
echo "\$ $MOCHA_EXE" echo "\$ $MOCHA_EXE"
$MOCHA_EXE $MOCHA_EXE 2> test/junit-node-integration.xml
else else
manage_es start $TESTING_BRANCH $ES_RELEASE manage_es start $TESTING_BRANCH $ES_RELEASE
grunt_ mochacov:integration_$TESTING_BRANCH grunt_ mochacov:integration_$TESTING_BRANCH