diff options
Diffstat (limited to 'testing/tox.ini')
| -rw-r--r-- | testing/tox.ini | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/testing/tox.ini b/testing/tox.ini index 6bc82b8e..a8186f70 100644 --- a/testing/tox.ini +++ b/testing/tox.ini @@ -6,11 +6,11 @@ skipsdist=True basepython = python2.7 commands = ./ensure-pysqlcipher-has-usleep.sh - py.test -x --ignore=tests/benchmarks --ignore=tests/responsiveness \ - --cov-report=html \ - --cov-report=term \ - --cov=leap.soledad \ - {posargs} + py.test -x \ + --cov-report=html \ + --cov-report=term \ + --cov=leap.soledad \ + {posargs} usedevelop = True deps = coverage @@ -25,6 +25,12 @@ deps = requests service_identity leap.common +# used by benchmarks + psutil + numpy + pytest-benchmark + elasticsearch + certifi # install soledad from current tree -e../ -e../[client] @@ -37,11 +43,12 @@ install_command = pip install {opts} {packages} [testenv:py34] basepython = python3.4 -commands = py.test --ignore=tests/benchmarks --ignore=tests/responsiveness \ - --cov-report=html \ - --cov-report=term \ - --cov=leap.soledad \ - {posargs} +commands = + py.test \ + --cov-report=html \ + --cov-report=term \ + --cov=leap.soledad \ + {posargs} usedevelop = True deps = coverage @@ -54,6 +61,12 @@ deps = couchdb requests service_identity +# used by benchmarks + psutil + numpy + pytest-benchmark + elasticsearch + certifi # install soledad local packages -e../ -e../[client] @@ -66,18 +79,13 @@ install_command = pip3 install {opts} {packages} [testenv:benchmark] deps = {[testenv]deps} - psutil - numpy - pytest-benchmark - elasticsearch - certifi commands = # we must make sure that installed pysqlcipher was built with the HAVE_USLEEP # flag, or we might have problems with concurrent db access. ./ensure-pysqlcipher-has-usleep.sh # run benchmarks twice: once for time and cpu and a second time for memory - py.test --benchmark-only {posargs} - py.test --benchmark-only --watch-memory {posargs} + py.test --subdir=benchmarks {posargs} + py.test --subdir=benchmarks --watch-memory {posargs} passenv = HOST_HOSTNAME [testenv:responsiveness] @@ -85,7 +93,7 @@ deps = {[testenv:benchmark]deps} commands = ./ensure-pysqlcipher-has-usleep.sh - pytest -m responsiveness {posargs} + py.test --subdir=responsiveness {posargs} [testenv:code-check] changedir = .. @@ -101,5 +109,6 @@ deps = {[testenv]deps} pytest-xdist install_command = pip install {opts} {packages} -commands = ./ensure-pysqlcipher-has-usleep.sh - py.test --ignore=tests/benchmarks {posargs} -n 4 +commands = + ./ensure-pysqlcipher-has-usleep.sh + py.test {posargs} -n 4 |