p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

GeoDjango test suite now takes advantage of `importlib` added in r10088. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10103 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2009-03-20 02:50:48 +00:00
parent 9eb061b2c0
commit 44b0f68f44
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,5 @@
import sys, unittest import sys, unittest
from django.utils.importlib import import_module
def geo_suite(): def geo_suite():
""" """
@ -45,7 +46,7 @@ def geo_suite():
test_suite_names.append('test_geoip') test_suite_names.append('test_geoip')
for suite_name in test_suite_names: for suite_name in test_suite_names:
tsuite = getattr(__import__('django.contrib.gis.tests', globals(), locals(), [suite_name]), suite_name) tsuite = import_module('django.contrib.gis.tests.' + suite_name)
s.addTest(tsuite.suite()) s.addTest(tsuite.suite())
return s, test_apps return s, test_apps
@ -87,14 +88,13 @@ def run_gis_tests(test_labels, **kwargs):
for test_app in test_apps: for test_app in test_apps:
module_name = 'django.contrib.gis.tests.%s' % test_app module_name = 'django.contrib.gis.tests.%s' % test_app
if mysql: if mysql:
test_module_name = 'tests_mysql' test_module = 'tests_mysql'
else: else:
test_module_name = 'tests' test_module = 'tests'
new_installed.append(module_name) new_installed.append(module_name)
# Getting the model test suite # Getting the model test suite
tsuite = getattr(__import__('django.contrib.gis.tests.%s' % test_app, globals(), locals(), [test_module_name]), tsuite = import_module(module_name + '.' + test_module)
test_module_name)
gis_suite.addTest(tsuite.suite()) gis_suite.addTest(tsuite.suite())
# Resetting the loaded flag to take into account what we appended to # Resetting the loaded flag to take into account what we appended to