Merge pull request #2744 from aanand/pytest-ini

Add pytest.ini
2016-02-08 14:19:40 -05:00 · 2016-02-08 14:19:40 -05:00 · 859cc2348c
parent fdf4a2e89e 8acb5e17e8
commit 859cc2348c
1 changed files with 4 additions and 1 deletions
--- a/tox.ini
+++ b/tox.ini
@ -15,7 +15,7 @@ deps =
    -rrequirements.txt
    -rrequirements-dev.txt
 commands =
-    py.test -v -rxs \
+    py.test -v \
        --cov=compose \
        --cov-report html \
        --cov-report term \
@ -47,3 +47,6 @@ max-line-length = 140
 # Set this high for now
 max-complexity = 12
 exclude = compose/packages
+
+[pytest]
+addopts = --tb=short -rxs