test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Now possible to run the GeoDjango test suite with a minimal settings file. Refs #10420, #14439. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2010-11-20 23:54:59 +00:00
parent d4bb8313f7
commit 7592d68541
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/gis/tests/__init__.py
View File

@ -30,8 +30,9 @@ class GeoDjangoTestSuiteRunner(DjangoTestSuiteRunner):
# Getting and storing the original values of INSTALLED_APPS and # Getting and storing the original values of INSTALLED_APPS and
# the ROOT_URLCONF. # the ROOT_URLCONF.
self.old_installed = settings.INSTALLED_APPS self.old_installed = getattr(settings, 'INSTALLED_APPS', None)
self.old_root_urlconf = settings.ROOT_URLCONF self.old_root_urlconf = getattr(settings, 'ROOT_URLCONF', None)
self.old_site_id = getattr(settings, 'SITE_ID', None)
# Tests that require use of a spatial database (e.g., creation of models) # Tests that require use of a spatial database (e.g., creation of models)
self.geo_apps = ['geoapp', 'relatedapp'] self.geo_apps = ['geoapp', 'relatedapp']
@ -62,11 +63,13 @@ class GeoDjangoTestSuiteRunner(DjangoTestSuiteRunner):
# Setting the URLs. # Setting the URLs.
settings.ROOT_URLCONF = 'django.contrib.gis.tests.urls' settings.ROOT_URLCONF = 'django.contrib.gis.tests.urls'
settings.SITE_ID = 1
def teardown_test_environment(self, **kwargs): def teardown_test_environment(self, **kwargs):
super(GeoDjangoTestSuiteRunner, self).teardown_test_environment(**kwargs) super(GeoDjangoTestSuiteRunner, self).teardown_test_environment(**kwargs)
settings.INSTALLED_APPS = self.old_installed settings.INSTALLED_APPS = self.old_installed
settings.ROOT_URLCONF = self.old_root_urlconf settings.ROOT_URLCONF = self.old_root_urlconf
settings.SITE_ID = self.old_site_id
def build_suite(self, test_labels, extra_tests=None, **kwargs): def build_suite(self, test_labels, extra_tests=None, **kwargs):
""" """