Skip to content

Commit

Permalink
Merge branch '0.16.x' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin Bach committed Jul 31, 2016
2 parents d87187a + a4868e4 commit db51cad
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .coveralls.yml
@@ -0,0 +1,2 @@
repo_token: YfchfjB9wbHxDS7MDadVe09f2StV0pds1
service_name: circleci
12 changes: 11 additions & 1 deletion circle.yml
Expand Up @@ -19,16 +19,26 @@ dependencies:
test:
override:
- make assets
- make docs
- kalite start --traceback -v2
- kalite status
- kalite stop --traceback -v2
- cd sc-*-linux && ./bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY --tunnel-identifier $CIRCLE_BUILD_NUM-$CIRCLE_NODE_INDEX --readyfile ~/sauce_is_ready > sc_output.txt 2>&1:
background: true
- while [ ! -e ~/sauce_is_ready ]; do sleep 1; done
- case $CIRCLE_NODE_INDEX in 0) make test-bdd ;; 1) make test-nobdd;; esac:
- case $CIRCLE_NODE_INDEX in 0) coverage run --source=kalite --omit="kalite/testing/*,*/tests/*,*/migrations/*" kalitectl.py manage test --bdd-only ;; 1) coverage run --source=kalite --omit="kalite/testing/*,*/tests/*,*/migrations/*" kalitectl.py manage test --no-bdd;; esac:
parallel: true
# TODO: replace below with "make lint" when we're pep8
- npm install -g jshint
- jshint kalite/*/static/js/*/
post:
- killall --wait sc # wait for Sauce Connect to close the tunnel
- COVERALLS_PARALLEL=true coveralls -v

notify:
webhooks:
- url: https://coveralls.io/webhook?repo_token=YWMKkAVqIigWxX8XerfykVab17vEKmdXO

general:
artifacts:
- 'coverage'
2 changes: 2 additions & 0 deletions requirements_test.txt
Expand Up @@ -8,4 +8,6 @@ mock==1.0.1
hachoir-core==1.3.3
hachoir-parser==1.3.4
hachoir-metadata==1.3.3
coverage<4
coveralls
sauceclient==0.2.1

0 comments on commit db51cad

Please sign in to comment.