run tests against python3 (#39533)

This commit is contained in:
Emmanuel Cazenave 2020-02-04 17:29:30 +01:00
parent ab07851642
commit 4aa84aed42
2 changed files with 7 additions and 6 deletions

2
Jenkinsfile vendored
View File

@ -34,7 +34,7 @@ pipeline {
utils.publish_coverage_native('index.html')
utils.publish_pylint('pylint.out')
}
junit '*_results.xml'
mergeJunitResults()
}
}
}

11
tox.ini
View File

@ -16,7 +16,7 @@
; along with this program. If not, see <http://www.gnu.org/licenses/>.
[tox]
envlist = py2-coverage-pylint
envlist = py2-junit, py3-junit-coverage
toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/passerelle-atreal-openads/{env:BRANCH_NAME:}
[testenv]
@ -26,12 +26,13 @@ usedevelop =
setenv =
DJANGO_SETTINGS_MODULE=passerelle.settings
PASSERELLE_SETTINGS_FILE=tests/settings.py
coverage: COVERAGE=--junitxml=test_results.xml --cov-report xml --cov-report html --cov=atreal_openads/
coverage: COVERAGE=--cov-report xml --cov-report html --cov=atreal_openads/
junit: JUNIT=--junitxml=junit-{envname}.xml
deps =
http://git.entrouvert.org/passerelle.git/snapshot/passerelle-master.tar.gz
pytest-cov
pytest-django
pytest>=3.3.0,<4
pytest>=3.3.0
WebTest
mock
httmock
@ -40,5 +41,5 @@ deps =
django-webtest<1.9.3
xmlschema<1.1
commands =
py.test {env:COVERAGE:} {posargs:tests/}
pylint: ./pylint.sh atreal_openads/
py.test {posargs: {env:COVERAGE:} {env:JUNIT:} tests/}
coverage: ./pylint.sh atreal_openads/