Merge branch 'master' into rcv3-worker-error-handling

rackerlabs · Feb 12, 2015 · 0b1a0c6 · 0b1a0c6
2 parents 46e2c86 + 57a8235
commit 0b1a0c6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,12 @@ python:
 install:
     - pip install -r dev_requirements.txt
     - pip install -r requirements.txt
+    - pip install coveralls
 
 script:
     - make lint
     - make docbook
-    - make unit
+    - make coverage
+
+after_script:
+    - coveralls
diff --git a/Makefile b/Makefile
@@ -63,13 +63,15 @@ flake8diff:
 flake8full:
 	flake8 ${PYDIRS}
 
+TRIAL_OPTIONS=--jobs=4 --random 0
+
 unit:
 ifneq ($(JENKINS_URL), )
-	trial --jobs=4 --random 0 --reporter=subunit ${UNITTESTS} \
+	trial ${TRIAL_OPTIONS} --reporter=subunit ${UNITTESTS} \
 		| tee subunit-output.txt
 	tail -n +4 subunit-output.txt | subunit2junitxml > test-report.xml
 else
-	trial --jobs=4 --random 0 ${UNITTESTS}
+	trial ${TRIAL_OPTIONS} ${UNITTESTS}
 endif
 
 integration:
@@ -87,7 +89,9 @@ else
 endif
 
 coverage:
-	coverage run --source=${CODEDIR} --branch `which trial` ${UNITTESTS}
+	coverage run --source=${CODEDIR} --branch `which trial` ${TRIAL_OPTIONS} ${UNITTESTS}
+
+coverage-html: coverage
 	coverage html -d _trial_coverage --omit="*/test/*"
 
 cleandocs: