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

Fixed regression in running the GeoDjango test suite after r13670 with addition of `GeoDjangoTestSuiteRunner` (replaces `run_gis_tests`, which is now a stub). 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2010-09-12 01:40:42 +00:00
parent 4311402216
commit f6074506fd
1 changed files with 86 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,115 +1,108 @@
import sys import sys
import unittest
from django.conf import settings
from django.db.models import get_app
from django.test.simple import build_suite, DjangoTestSuiteRunner
def run_tests(*args, **kwargs): def run_tests(*args, **kwargs):
from django.test.simple import run_tests as base_run_tests from django.test.simple import run_tests as base_run_tests
return base_run_tests(*args, **kwargs) return base_run_tests(*args, **kwargs)
def geo_suite(): def run_gis_tests(test_labels, verbosity=1, interactive=True, failfast=False, extra_tests=None):
""" import warnings
Builds a test suite for the GIS package. This is not named warnings.warn(
`suite` so it will not interfere with the Django test suite (since 'The run_gis_tests() test runner has been deprecated in favor of GeoDjangoTestSuiteRunner.',
spatial database tables are required to execute these tests on PendingDeprecationWarning
some backends). )
""" test_runner = GeoDjangoTestSuiteRunner(verbosity=verbosity, interactive=interactive, failfast=failfast)
from django.conf import settings return test_runner.run_tests(test_labels, extra_tests=extra_tests)
from django.contrib.gis.geos import GEOS_PREPARE
from django.contrib.gis.gdal import HAS_GDAL
from django.contrib.gis.utils import HAS_GEOIP
from django.contrib.gis.tests.utils import postgis, mysql
from django.db import connection
from django.utils.importlib import import_module
gis_tests = [] class GeoDjangoTestSuiteRunner(DjangoTestSuiteRunner):
# Adding the GEOS tests. def setup_test_environment(self, **kwargs):
from django.contrib.gis.geos import tests as geos_tests super(GeoDjangoTestSuiteRunner, self).setup_test_environment(**kwargs)
gis_tests.append(geos_tests.suite())
# Tests that require use of a spatial database (e.g., creation of models) from django.db import connection
test_apps = ['geoapp', 'relatedapp'] from django.contrib.gis.geos import GEOS_PREPARE
if postgis and connection.ops.geography: from django.contrib.gis.gdal import HAS_GDAL
# Test geography support with PostGIS 1.5+.
test_apps.append('geogapp')
# Tests that do not require setting up and tearing down a spatial database. # Getting and storing the original values of INSTALLED_APPS and
test_suite_names = [ # the ROOT_URLCONF.
'test_measure', self.old_installed = settings.INSTALLED_APPS
] self.old_root_urlconf = settings.ROOT_URLCONF
if HAS_GDAL: # Tests that require use of a spatial database (e.g., creation of models)
# These tests require GDAL. self.geo_apps = ['geoapp', 'relatedapp']
if not mysql: if connection.ops.postgis and connection.ops.geography:
test_apps.append('distapp') # Test geography support with PostGIS 1.5+.
self.geo_apps.append('geogapp')
# Only PostGIS using GEOS 3.1+ can support 3D so far. if HAS_GDAL:
if postgis and GEOS_PREPARE: # The following GeoDjango test apps depend on GDAL support.
test_apps.append('geo3d') if not connection.ops.mysql:
self.geo_apps.append('distapp')
test_suite_names.extend(['test_spatialrefsys', 'test_geoforms']) # 3D apps use LayerMapping, which uses GDAL.
test_apps.append('layermap') if connection.ops.postgis and GEOS_PREPARE:
self.geo_apps.append('geo3d')
# Adding the GDAL tests. self.geo_apps.append('layermap')
from django.contrib.gis.gdal import tests as gdal_tests
gis_tests.append(gdal_tests.suite())
else:
print >>sys.stderr, "GDAL not available - no tests requiring GDAL will be run."
if HAS_GEOIP and hasattr(settings, 'GEOIP_PATH'): # Constructing the new INSTALLED_APPS, and including applications
test_suite_names.append('test_geoip') # within the GeoDjango test namespace (`self.geo_apps`).
new_installed = ['django.contrib.sites',
'django.contrib.sitemaps',
'django.contrib.gis',
]
new_installed.extend(['django.contrib.gis.tests.%s' % app
for app in self.geo_apps])
settings.INSTALLED_APPS = new_installed
# Adding the rest of the suites from the modules specified # Setting the URLs.
# in the `test_suite_names`. settings.ROOT_URLCONF = 'django.contrib.gis.tests.urls'
for suite_name in test_suite_names:
tsuite = import_module('django.contrib.gis.tests.' + suite_name)
gis_tests.append(tsuite.suite())
return gis_tests, test_apps 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
def run_gis_tests(test_labels, **kwargs): def build_suite(self, test_labels, extra_tests=None, **kwargs):
""" """
Use this routine as the TEST_RUNNER in your settings in order to run the This method is overridden to construct a suite consisting only of tests
GeoDjango test suite. This must be done as a database superuser for for GeoDjango.
PostGIS, so read the docstring in `run_test()` below for more details. """
""" suite = unittest.TestSuite()
from django.conf import settings
from django.db.models import loading
from django.contrib.gis.tests.utils import mysql
# Getting initial values. # Adding the GEOS tests.
old_installed = settings.INSTALLED_APPS from django.contrib.gis.geos import tests as geos_tests
old_root_urlconf = settings.ROOT_URLCONF suite.addTest(geos_tests.suite())
# Overridding the INSTALLED_APPS with only what we need, # Adding the measurment tests.
# to prevent unnecessary database table creation. from django.contrib.gis.tests import test_measure
new_installed = ['django.contrib.sites', suite.addTest(test_measure.suite())
'django.contrib.sitemaps',
'django.contrib.gis',
]
# Setting the URLs. # Adding GDAL tests, and any test suite that depends on GDAL, to the
settings.ROOT_URLCONF = 'django.contrib.gis.tests.urls' # suite if GDAL is available.
from django.contrib.gis.gdal import HAS_GDAL
if HAS_GDAL:
from django.contrib.gis.gdal import tests as gdal_tests
suite.addTest(gdal_tests.suite())
# Creating the test suite, adding the test models to INSTALLED_APPS from django.contrib.gis.tests import test_spatialrefsys, test_geoforms
# so they will be tested. suite.addTest(test_spatialrefsys.suite())
gis_tests, test_apps = geo_suite() suite.addTest(test_geoforms.suite())
for test_model in test_apps: else:
module_name = 'django.contrib.gis.tests.%s' % test_model sys.stderr.write('GDAL not available - no tests requiring GDAL will be run.\n')
new_installed.append(module_name)
# Resetting the loaded flag to take into account what we appended to # Add GeoIP tests to the suite, if the library and data is available.
# the INSTALLED_APPS (since this routine is invoked through from django.contrib.gis.utils import HAS_GEOIP
# django/core/management, it caches the apps; this ensures that syncdb if HAS_GEOIP and hasattr(settings, 'GEOIP_PATH'):
# will see our appended models) from django.contrib.gis.tests import test_geoip
settings.INSTALLED_APPS = new_installed suite.addTest(test_geoip.suite())
loading.cache.loaded = False
kwargs['extra_tests'] = gis_tests # Finally, adding the suites for each of the GeoDjango test apps.
for app_name in self.geo_apps:
suite.addTest(build_suite(get_app(app_name)))
# Running the tests using the GIS test runner. return suite
result = run_tests(test_labels, **kwargs)
# Restoring modified settings.
settings.INSTALLED_APPS = old_installed
settings.ROOT_URLCONF = old_root_urlconf
return result