aboutsummaryrefslogtreecommitdiffstats
path: root/runtests.py
diff options
context:
space:
mode:
authorTom Christie2015-02-06 14:35:06 +0000
committerTom Christie2015-02-06 14:35:06 +0000
commit3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91 (patch)
tree0649d42b20b875e97cb551b987644b61e7860e84 /runtests.py
parentc06a82d0531f4cb290baacee196829c770913eaa (diff)
parent1f996128458570a909d13f15c3d739fb12111984 (diff)
downloaddjango-rest-framework-model-serializer-caching.tar.bz2
Resolve merge conflictmodel-serializer-caching
Diffstat (limited to 'runtests.py')
-rwxr-xr-xruntests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtests.py b/runtests.py
index abf15a62..0008bfae 100755
--- a/runtests.py
+++ b/runtests.py
@@ -8,8 +8,8 @@ import subprocess
PYTEST_ARGS = {
- 'default': ['tests'],
- 'fast': ['tests', '-q'],
+ 'default': ['tests', '--tb=short'],
+ 'fast': ['tests', '--tb=short', '-q'],
}
FLAKE8_ARGS = ['rest_framework', 'tests', '--ignore=E501']