andpp/mopidy-musicbox-webclient
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Combine 'py27' and 'test' runs.

Browse Source
This commit is contained in:
jcass 2016-03-28 09:04:33 +02:00
parent 7563a52c07
commit aa772ce955
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -14,9 +14,9 @@ addons:
- mopidy - mopidy
env: 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=flake8
- TOX_ENV=test
- TOX_ENV=eslint - TOX_ENV=eslint
- TOX_ENV=csslint - TOX_ENV=csslint
- TOX_ENV=tidy - TOX_ENV=tidy
@ -28,9 +28,15 @@ before_install:
install: install:
- "pip install tox" - "pip install tox"
- "gem install coveralls-lcov"
before_script:
- "./autogen.sh"
- "./configure --enable-coverage"
script: script:
- "make check"
- "tox -e $TOX_ENV" - "tox -e $TOX_ENV"
after_success: after_success:
- "if [ $TOX_ENV == 'test' ]; then pip install coveralls; coveralls --merge=.karma_coverage/coverage-final.json; fi" - "if [ $TOX_ENV == 'py27,test' ]; then coveralls-lcov -v -n .karma_coverage/lcov.info > .karma_coverage/lcov.json; pip install coveralls; coveralls --merge=.karma_coverage/lcov.json; fi"

1
karma.conf.js
View File

@ -74,7 +74,6 @@ module.exports = function (config) {
dir: '.karma_coverage/', dir: '.karma_coverage/',
reporters: [ reporters: [
{ type: 'lcov', subdir: '.' }, { type: 'lcov', subdir: '.' },
{ type: 'json', subdir: '.' },
{ type: 'text' } { type: 'text' }
] ]
} }

2
tox.ini
View File

@ -2,6 +2,7 @@
envlist = py27, flake8, test, eslint, csslint, tidy envlist = py27, flake8, test, eslint, csslint, tidy
[testenv] [testenv]
passenv = TRAVIS TRAVIS_JOB_ID TRAVIS_BRANCH
sitepackages = true sitepackages = true
whitelist_externals = whitelist_externals =
py.test py.test
@ -31,7 +32,6 @@ skip_install = true
commands = flake8 --show-source --statistics --max-line-length 120 {posargs:mopidy_musicbox_webclient tests} commands = flake8 --show-source --statistics --max-line-length 120 {posargs:mopidy_musicbox_webclient tests}
[testenv:test] [testenv:test]
envdir = py27
sitepackages = false sitepackages = false
whitelist_externals = whitelist_externals =
/bin/bash /bin/bash