summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-02-09 22:27:22 -0200
committerdrebs <drebs@leap.se>2013-02-09 22:27:22 -0200
commit46a3373295a683db9b66c233b07a7a948b8147bc (patch)
tree410a47871bfd8654ddabbb53f3c29a89c1550e71 /tox.ini
parente726f3df7c7efbe4069846468ffdbed6829ccfc4 (diff)
parentb376948ccd59aa02022123102eaae359a536e4e6 (diff)
Merge branch 'develop' into feature/soledad-api
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 bf4d8fb6..e7e1015f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
[tox]
-envlist = py26,py27,pep8
+envlist = py26
[testenv]
deps = -r{toxinidir}/pkg/requirements.pip
-r{toxinidir}/pkg/test-requirements.pip
sitepackages = True
-commands = nosetests
+commands = xvfb-run nosetests leap --exclude-dir=src/leap/soledad --exclude-dir=src/leap/email/
[testenv:pep8]
deps = pep8==1.1