Skip to content

Commit

Permalink
Convert lcov.info to JSON format before submitting to coveralls.
Browse files Browse the repository at this point in the history
  • Loading branch information
jcass77 committed Mar 28, 2016
1 parent 7563a52 commit 7eea023
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Expand Up @@ -14,9 +14,9 @@ addons:
- mopidy

env:
- TOX_ENV=py27
# Need to run 'py27' and 'test' together so that we can share coverage reports.
- TOX_ENV=py27,test
- TOX_ENV=flake8
- TOX_ENV=test
- TOX_ENV=eslint
- TOX_ENV=csslint
- TOX_ENV=tidy
Expand All @@ -33,4 +33,5 @@ script:
- "tox -e $TOX_ENV"

after_success:
- "if [ $TOX_ENV == 'test' ]; then pip install coveralls; coveralls --merge=.karma_coverage/coverage-final.json; fi"
# We just use 'coveralls-lcov' to convert lcov.info to JSON format.
- "if [ $TOX_ENV == 'py27,test' ]; then gem install coveralls-lcov; coveralls-lcov -v -n .karma_coverage/lcov.info > .karma_coverage/lcov.json; pip install coveralls; coveralls --merge=.karma_coverage/lcov.json; fi"
1 change: 0 additions & 1 deletion karma.conf.js
Expand Up @@ -74,7 +74,6 @@ module.exports = function (config) {
dir: '.karma_coverage/',
reporters: [
{ type: 'lcov', subdir: '.' },
{ type: 'json', subdir: '.' },
{ type: 'text' }
]
}
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -2,6 +2,7 @@
envlist = py27, flake8, test, eslint, csslint, tidy

[testenv]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
sitepackages = true
whitelist_externals =
py.test
Expand Down Expand Up @@ -31,7 +32,6 @@ skip_install = true
commands = flake8 --show-source --statistics --max-line-length 120 {posargs:mopidy_musicbox_webclient tests}

[testenv:test]
envdir = py27
sitepackages = false
whitelist_externals =
/bin/bash
Expand Down

0 comments on commit 7eea023

Please sign in to comment.