summaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini29
1 files changed, 14 insertions, 15 deletions
diff --git a/tox.ini b/tox.ini
index 54ff3b873..aacbddb2a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -31,11 +31,11 @@ deps =
[testenv:py27]
sitepackages = True
commands =
- python2.7 {envbindir}/pkidestroy --help
- python2.7 {envbindir}/pkispawn --help
- python2.7 {envbindir}/pki-server --help
- python2.7 {envbindir}/pki-server-upgrade --help
- python2.7 {envbindir}/pki-upgrade --help
+ {envpython} {envbindir}/pkidestroy --help
+ {envpython} {envbindir}/pkispawn --help
+ {envpython} {envbindir}/pki-server --help
+ {envpython} {envbindir}/pki-server-upgrade --help
+ {envpython} {envbindir}/pki-upgrade --help
py.test --capture=no --strict {posargs}
[testenv:lint]
@@ -44,16 +44,15 @@ sitepackages = True
deps =
pylint
commands =
- pylint \
- {envsitepackagesdir}/pki \
- {envbindir}/pkidestroy \
- {envbindir}/pkispawn \
- {envbindir}/pki-server \
- {envbindir}/pki-server-upgrade \
- {envbindir}/pki-upgrade \
- {envbindir}/pki \
- --rcfile={toxinidir}/dogtag.pylintrc \
- {posargs}
+ {envpython} {toxinidir}/pylint-build-scan.py tox
+
+[testenv:lint3k]
+basepython = python2.7
+sitepackages = True
+deps =
+ pylint
+commands =
+ {envpython} {toxinidir}/pylint-build-scan.py tox -- --py3k
[testenv:pep8]
basepython = python2.7