diff options
| author | Tom Christie | 2015-02-06 14:35:06 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-02-06 14:35:06 +0000 | 
| commit | 3dff9a4fe2952cf632ca7f4cd9ecf4221059ca91 (patch) | |
| tree | 0649d42b20b875e97cb551b987644b61e7860e84 /runtests.py | |
| parent | c06a82d0531f4cb290baacee196829c770913eaa (diff) | |
| parent | 1f996128458570a909d13f15c3d739fb12111984 (diff) | |
| download | django-rest-framework-model-serializer-caching.tar.bz2 | |
Resolve merge conflictmodel-serializer-caching
Diffstat (limited to 'runtests.py')
| -rwxr-xr-x | runtests.py | 4 | 
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'] | 
