Skip to content

Commit

Permalink
Put back coverage, doc and scripts tests in Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasfillon committed Feb 1, 2016
1 parent c499a5b commit 2c9380d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 18 deletions.
30 changes: 13 additions & 17 deletions .travis.yml
Expand Up @@ -43,30 +43,26 @@ install:
script:
# -------------DEFAULT--------------------
- if [[ $TEST_TARGET == 'default' ]]; then
docker-compose -f docker-compose.yml -f conf/build.yml run app sh -c "cd /srv/src/timeside; python setup.py test";
docker-compose -f docker-compose.yml -f conf/build.yml run app sh -c "cd /srv/src/timeside; coverage run --source=timeside --omit=timeside/plugins/analyzer/external/yaafe.py setup.py test";
fi
# -------------DOC------------------------
- if [[ $TEST_TARGET == 'doc' ]]; then
docker-compose -f docker-compose.yml -f conf/build.yml run app sh -c "cd /srv/src/timeside/doc; make html; make doctest;"
fi
# coverage run --source=timeside --omit=timeside/plugins/analyzer/external/yaafe.py setup.py test;
# # -------------DOC------------------------
# - if [[ $TEST_TARGET == 'doc' ]]; then
# cd doc;
# make html;
# make doctest;
# cd ..;
# fi
# # -------------CLI-------------------------
# - if [[ $TEST_TARGET == 'cli' ]]; then
# ./tests/test_scripts.sh;
# fi
- if [[ $TEST_TARGET == 'cli' ]]; then
docker-compose -f docker-compose.yml -f conf/build.yml run app sh -c "cd /srv/src/timeside; ./tests/test_scripts.sh;"
fi
# # -------------SERVER-------------------------
# # Get environment variables from .env file and run test
# - if [[ $TEST_TARGET == 'server' ]]; then
# export $(egrep -v "^\s*(#|$)" ./app/sandbox/ts-sqlite.env);
# ./tests/test_server.sh;
# fi
#
#after_success:
after_success:
# - # -------------DEFAULT--------------------
# - if [[ $TEST_TARGET == 'default' ]]; then
# pip install python-coveralls;
# coveralls;
# fi
- if [[ $TEST_TARGET == 'default' ]]; then
pip install python-coveralls;
coveralls;
fi
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -80,6 +80,6 @@ def run_tests(self):
include_package_data=True,
zip_safe=False,
scripts=['scripts/timeside-waveforms', 'scripts/timeside-launch'],
tests_require=['pytest'],
tests_require=['pytest', 'coverage'],
cmdclass={'test': PyTest},
)

0 comments on commit 2c9380d

Please sign in to comment.