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
This commit is contained in:
Tom Christie 2012-10-27 18:44:23 +01:00
parent cef379db06
commit b9e576f16e
5 changed files with 16 additions and 23 deletions

View File

@ -32,7 +32,7 @@ def main():
else:
print usage()
sys.exit(1)
failures = test_runner.run_tests(['rest_framework' + test_case])
failures = test_runner.run_tests(['tests' + test_case])
sys.exit(failures)

View File

@ -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):

View File

@ -1,13 +0,0 @@
"""
Force import of all modules in this package in order to get the standard test
runner to pick up the tests. Yowzers.
"""
import os
modules = [filename.rsplit('.', 1)[0]
for filename in os.listdir(os.path.dirname(__file__))
if filename.endswith('.py') and not filename.startswith('_')]
__test__ = dict()
for module in modules:
exec("from rest_framework.tests.%s import *" % module)

View File

@ -40,7 +40,7 @@ class RESTFrameworkModel(models.Model):
Base for test models that sets app_label, so they play nicely.
"""
class Meta:
app_label = 'rest_framework'
app_label = 'tests'
abstract = True

View File

@ -0,0 +1,13 @@
"""
Force import of all modules in this package in order to get the standard test
runner to pick up the tests. Yowzers.
"""
import os
modules = [filename.rsplit('.', 1)[0]
for filename in os.listdir(os.path.dirname(__file__))
if filename.endswith('.py') and not filename.startswith('_')]
__test__ = dict()
for module in modules:
exec("from rest_framework.tests.%s import *" % module)