Skip to content

Commit

Permalink
using pytest now
Browse files Browse the repository at this point in the history
josuebrunel committed Oct 7, 2015
1 parent 5bb38b4 commit 58e9285
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -9,9 +9,9 @@ python:
- pypy3
install:
- pip install -r requirements.txt
- pip install coverage coveralls
- pip install coverage coveralls pytest
script:
- coverage run --source=myql -m unittest discover
- coverage run --source=myql -m pytest -v tests/tests.py
env:
global:
secure: hXpkZqclyUXMX586jS4BtJmYsrszVr/jWbMiLWLOZ2z7n5LK9INziKkOqYu0JTBskAHVEmhxJ7oNOD9gI/06btLO5NLBONN3qtsHq4UruCo0Zlx2BgaDfR5FqnrVqk+fMbLCbzWgo0wShM4o8jTGy7l22xqhhYAsuubmayqEfPk=
6 changes: 3 additions & 3 deletions run_tests.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
if [ ! -z $1 ]; then
TestCase=".${1}"
TestCase="::${1}"
else
TestCase=''
fi

if [ ! -z $2 ]; then
Test=".${2}"
Test="::${2}"
else
Test=''
fi

coverage run --source=myql -m unittest tests$TestCase$Test
coverage run --source=myql -m pytest -vs tests/tests.py$TestCase$Test
coverage report
coverage html

0 comments on commit 58e9285

Please sign in to comment.