Author: kmtracey
Date: 2010-04-12 07:39:18 -0500 (Mon, 12 Apr 2010)
New Revision: 12950
Added:
django/trunk/tests/regressiontests/admin_scripts/broken_app/
django/trunk/tests/regressiontests/admin_scripts/broken_app/__init__.py
django/trunk/tests/regressiontests/admin_scripts/broken_app/models.py
Modified:
django/trunk/django/db/models/loading.py
django/trunk/tests/regressiontests/admin_scripts/tests.py
Log:
Fixed #11696: Changed app loading code so that it does not swallow import
errors that used to be (prior to r10088) raised.
Modified: django/trunk/django/db/models/loading.py
===================================================================
--- django/trunk/django/db/models/loading.py 2010-04-11 19:01:02 UTC (rev
12949)
+++ django/trunk/django/db/models/loading.py 2010-04-12 12:39:18 UTC (rev
12950)
@@ -5,6 +5,7 @@
from django.utils.datastructures import SortedDict
from django.utils.importlib import import_module
+import imp
import sys
import os
import threading
@@ -71,8 +72,9 @@
"""
self.handled[app_name] = None
self.nesting_level += 1
+ app_module = import_module(app_name)
try:
- models = import_module('.models', app_name)
+ imp.find_module('models', app_module.__path__)
except ImportError:
self.nesting_level -= 1
if can_postpone:
@@ -82,6 +84,7 @@
# populate).
self.postponed.append(app_name)
return None
+ models = import_module('.models', app_name)
self.nesting_level -= 1
if models not in self.app_store:
self.app_store[models] = len(self.app_store)
Added: django/trunk/tests/regressiontests/admin_scripts/broken_app/__init__.py
===================================================================
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/broken_app/__init__.py
___________________________________________________________________
Name: svn:eol-style
+ native
Added: django/trunk/tests/regressiontests/admin_scripts/broken_app/models.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/broken_app/models.py
(rev 0)
+++ django/trunk/tests/regressiontests/admin_scripts/broken_app/models.py
2010-04-12 12:39:18 UTC (rev 12950)
@@ -0,0 +1 @@
+from django.db import modelz
Property changes on:
django/trunk/tests/regressiontests/admin_scripts/broken_app/models.py
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: django/trunk/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/trunk/tests/regressiontests/admin_scripts/tests.py 2010-04-11
19:01:02 UTC (rev 12949)
+++ django/trunk/tests/regressiontests/admin_scripts/tests.py 2010-04-12
12:39:18 UTC (rev 12950)
@@ -13,7 +13,7 @@
from django.conf import settings
class AdminScriptTestCase(unittest.TestCase):
- def write_settings(self, filename, apps=None, is_dir=False):
+ def write_settings(self, filename, apps=None, is_dir=False, sdict=None):
test_dir = os.path.dirname(os.path.dirname(__file__))
if is_dir:
settings_dir = os.path.join(test_dir,filename)
@@ -39,6 +39,10 @@
if apps:
settings_file.write("INSTALLED_APPS = %s\n" % apps)
+ if sdict:
+ for k, v in sdict.items():
+ settings_file.write("%s = %s\n" % (k, v))
+
settings_file.close()
def remove_settings(self, filename, is_dir=False):
@@ -952,6 +956,28 @@
self.assertNoOutput(out)
self.assertOutput(err, "Unknown command: 'noargs_command'")
+
+class ManageValidateImportErrorsReported(AdminScriptTestCase):
+ def tearDown(self):
+ self.remove_settings('settings.py')
+
+ def test_nonexistent_app(self):
+ "manage.py validate reports an error on a non-existent app in
INSTALLED_APPS"
+ self.write_settings('settings.py', apps=['admin_scriptz.broken_app'],
sdict={'USE_I18N': False})
+ args = ['validate']
+ out, err = self.run_manage(args)
+ self.assertNoOutput(out)
+ self.assertOutput(err, 'No module named admin_scriptz.broken_app')
+
+ def test_broken_app(self):
+ "manage.py validate reports an ImportError if an app's models.py
raises one on import"
+ self.write_settings('settings.py', apps=['admin_scripts.broken_app'])
+ args = ['validate']
+ out, err = self.run_manage(args)
+ self.assertNoOutput(out)
+ self.assertOutput(err, 'ImportError')
+
+
##########################################################################
# COMMAND PROCESSING TESTS
# Check that user-space commands are correctly handled - in particular,
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
