diff options
| author | Tom Christie | 2012-10-27 18:44:23 +0100 | 
|---|---|---|
| committer | Tom Christie | 2012-10-27 18:44:23 +0100 | 
| commit | b9e576f16ef7cc98f671e9c18ff8ae1a95bfe3ad (patch) | |
| tree | 021168fd72253db4e51f8f83dc39cdef8970ebc8 /rest_framework/runtests/settings.py | |
| parent | cef379db065711bd2f1b0805d28a56f7a80cef37 (diff) | |
| download | django-rest-framework-b9e576f16ef7cc98f671e9c18ff8ae1a95bfe3ad.tar.bz2 | |
Push tests into a seperate app namespace 'rest_framework.test'
Prevents tests from running by default when rest_framework is installed
as 3rd party app.
Fixes #316, #185
Diffstat (limited to 'rest_framework/runtests/settings.py')
| -rw-r--r-- | rest_framework/runtests/settings.py | 9 | 
1 files changed, 1 insertions, 8 deletions
diff --git a/rest_framework/runtests/settings.py b/rest_framework/runtests/settings.py index 67de82c8..951b1e72 100644 --- a/rest_framework/runtests/settings.py +++ b/rest_framework/runtests/settings.py @@ -91,6 +91,7 @@ INSTALLED_APPS = (      # 'django.contrib.admindocs',      'rest_framework',      'rest_framework.authtoken', +    'rest_framework.tests'  )  STATIC_URL = '/static/' @@ -100,14 +101,6 @@ import django  if django.VERSION < (1, 3):      INSTALLED_APPS += ('staticfiles',) -# OAuth support is optional, so we only test oauth if it's installed. -try: -    import oauth_provider -except ImportError: -    pass -else: -    INSTALLED_APPS += ('oauth_provider',) -  # If we're running on the Jenkins server we want to archive the coverage reports as XML.  import os  if os.environ.get('HUDSON_URL', None):  | 
