diff options
| author | Victor Shyba <victor1984@riseup.net> | 2016-11-19 21:52:30 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2016-12-12 09:15:21 -0200 |
| commit | 63c33b1b20e013571fb870205302bbc9e4a06e23 (patch) | |
| tree | ae36bcfec4948f4625531d15c9b95bf5cbacdf86 /testing/tox.ini | |
| parent | c26915bde89b970311d83956aea8255b8d5998e1 (diff) | |
[tests] use options instead of marks
When we use marks the new pytests from benchmarks folder are collected
and ignored, but this causes trial to fail sometimes. Using --ignore
avoids it from being loaded while --benchmark-only will properly select
the benchmarks for tox, as intended.
Diffstat (limited to 'testing/tox.ini')
| -rw-r--r-- | testing/tox.ini | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/testing/tox.ini b/testing/tox.ini index f720d0a6..c46c6af1 100644 --- a/testing/tox.ini +++ b/testing/tox.ini @@ -4,7 +4,7 @@ skipsdist=True [testenv] basepython = python2.7 -commands = py.test -m "not benchmark" \ +commands = py.test --ignore=tests/benchmarks \ --cov-report=html \ --cov-report=term \ --cov=leap.soledad \ @@ -35,7 +35,7 @@ install_command = pip install {opts} {packages} deps = {[testenv]deps} pytest-benchmark -commands = py.test -m benchmark {posargs} +commands = py.test --benchmark-only {posargs} [testenv:code-check] changedir = .. @@ -51,4 +51,4 @@ 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 |