summaryrefslogtreecommitdiff
path: root/testing/tox.ini
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2016-12-22 17:36:15 -0200
committerdrebs <drebs@leap.se>2016-12-22 17:36:15 -0200
commit8a463796bbaba3979234b0699d140947581421e7 (patch)
treed1e2ea96ed91ac66c7e52a30d16246a498ae9ed6 /testing/tox.ini
parentf072f18f317ea31e66c7890d672b5d2fd9f3ef14 (diff)
parente360a3a75999503cf45bfbbad69970a452cf3d32 (diff)
Merge tag '0.9.2'
Tag version 0.9.2 # gpg: Signature made Thu 22 Dec 2016 05:33:30 PM BRST # gpg: using RSA key 0x6071E70DCACC60B2 # gpg: Good signature from "drebs (work key) <db@leap.se>" [ultimate] # gpg: aka "drebs (work key) <drebs@leap.se>" [ultimate] # Impressão da chave primária: 9F73 295B 6306 E06F 3151 99AE 6071 E70D CACC 60B2
Diffstat (limited to 'testing/tox.ini')
-rw-r--r--testing/tox.ini20
1 files changed, 12 insertions, 8 deletions
diff --git a/testing/tox.ini b/testing/tox.ini
index 31cb8a4f..c46c6af1 100644
--- a/testing/tox.ini
+++ b/testing/tox.ini
@@ -1,12 +1,15 @@
[tox]
envlist = py27
+skipsdist=True
[testenv]
basepython = python2.7
-commands = py.test --cov-report=html \
+commands = py.test --ignore=tests/benchmarks \
+ --cov-report=html \
--cov-report=term \
- --cov=leap.soledad \
- {posargs}
+ --cov=leap.soledad \
+ {posargs}
+usedevelop = True
deps =
coverage
pytest
@@ -18,6 +21,7 @@ deps =
pdbpp
couchdb
requests
+ service_identity
# install soledad local packages
-e../common
-e../client
@@ -27,11 +31,11 @@ setenv =
TERM=xterm
install_command = pip install {opts} {packages}
-[testenv:perf]
+[testenv:benchmark]
deps =
{[testenv]deps}
pytest-benchmark
-commands = py.test tests/perf {posargs}
+commands = py.test --benchmark-only {posargs}
[testenv:code-check]
changedir = ..
@@ -39,12 +43,12 @@ deps =
pep8
flake8
commands =
- pep8 client server common
- flake8 --ignore=F812,E731 client server common
+ pep8
+ flake8
[testenv:parallel]
deps =
{[testenv]deps}
pytest-xdist
install_command = pip install {opts} {packages}
-commands = py.test {posargs} -n 4
+commands = py.test --ignore=tests/benchmarks {posargs} -n 4