aboutsummaryrefslogtreecommitdiffstats
path: root/tox.ini
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-27 11:09:42 -0500
committerJean-Paul Calderone <exarkun@twistedmatrix.com>2013-12-27 11:09:42 -0500
commit08adc00087c8fe128abc2317776de1f974f4eed6 (patch)
tree9baacf858eb2ab752505cec675ddda118ed2f35d /tox.ini
parentcf99cc77f863a7254d449ecb5f80a35ad7db11ab (diff)
parentb645521e84026633f666aa107816ac2fc5e05cc6 (diff)
downloadcryptography-08adc00087c8fe128abc2317776de1f974f4eed6.tar.gz
cryptography-08adc00087c8fe128abc2317776de1f974f4eed6.tar.bz2
cryptography-08adc00087c8fe128abc2317776de1f974f4eed6.zip
Merge remote-tracking branch 'origin/master' into some-typedef-fixes
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 39fe024f..61143112 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,7 @@ deps =
coverage
pretend
commands =
- coverage run --source=cryptography/,tests/ -m pytest --strict
+ coverage run --source=cryptography/,tests/ -m pytest --capture=no --strict
coverage report -m
[testenv:docs]
@@ -24,7 +24,7 @@ commands =
# Temporarily disable coverage on pypy because of performance problems with
# coverage.py on pypy.
[testenv:pypy]
-commands = py.test
+commands = py.test --capture=no
[testenv:pep8]
deps = flake8