summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-07-02 22:29:32 +0900
committerKali Kaneko <kali@leap.se>2013-07-02 22:29:32 +0900
commit1d30e2580592ef905d9b21c475459da1e40b1cd6 (patch)
tree6ec48c6b5234da55ecc91ad3c6235fb20b61315c /tox.ini
parent81dc8ebe9ef46c0fafa75cba5c4959bb822da686 (diff)
parent5b975799ce9b7a6e0a88be4bcb48bdfb90800bb3 (diff)
Merge branch 'master' of ssh://leap.se/leap_client
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini4
1 files changed, 2 insertions, 2 deletions
diff --git a/tox.ini b/tox.ini
index a9107c71..e041515d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,9 +3,9 @@ envlist = py26,py27
[testenv]
deps = -r{toxinidir}/pkg/requirements.pip
- -r{toxinidir}/pkg/test-requirements.pip
+ -r{toxinidir}/pkg/requirements-testing.pip
sitepackages = True
-commands = xvfb-run nosetests leap --exclude-dir=src/leap/soledad
+commands = xvfb-run nosetests leap --first-package-wins --exclude=soledad*
[testenv:pep8]
deps = pep8==1.1