From 4a8519334d5649f242ea5f8b3a0547b26831129b Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Sat, 20 Nov 2010 23:57:01 +0000 Subject: [PATCH] [1.2.X] Now possible to run the GeoDjango test suite with a minimal settings file. Refs #10420, #14439. Backport of r14653 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14654 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/tests/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/django/contrib/gis/tests/__init__.py b/django/contrib/gis/tests/__init__.py index d9182f3877..434b181589 100644 --- a/django/contrib/gis/tests/__init__.py +++ b/django/contrib/gis/tests/__init__.py @@ -29,8 +29,9 @@ class GeoDjangoTestSuiteRunner(DjangoTestSuiteRunner): # Getting and storing the original values of INSTALLED_APPS and # the ROOT_URLCONF. - self.old_installed = settings.INSTALLED_APPS - self.old_root_urlconf = settings.ROOT_URLCONF + self.old_installed = getattr(settings, 'INSTALLED_APPS', None) + 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) self.geo_apps = ['geoapp', 'relatedapp'] @@ -61,11 +62,13 @@ class GeoDjangoTestSuiteRunner(DjangoTestSuiteRunner): # Setting the URLs. settings.ROOT_URLCONF = 'django.contrib.gis.tests.urls' + settings.SITE_ID = 1 def teardown_test_environment(self, **kwargs): super(GeoDjangoTestSuiteRunner, self).teardown_test_environment(**kwargs) settings.INSTALLED_APPS = self.old_installed settings.ROOT_URLCONF = self.old_root_urlconf + settings.SITE_ID = self.old_site_id def build_suite(self, test_labels, extra_tests=None, **kwargs): """