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

Fixed #12574 -- Removed an unnecessary exception catch from the system runtest script, which could hide failing tests. Thanks to CarlFK for the report, and Ramiro Morales for the polish. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-08-20 15:03:11 +00:00
parent 1bf25e9bc6
commit d33736b3ee
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/runtests.py
View File

@ -122,22 +122,19 @@ def django_tests(verbosity, interactive, failfast, test_labels):
get_apps() get_apps()
# Load all the test model apps. # Load all the test model apps.
test_labels_set = set([label.split('.')[0] for label in test_labels])
for model_dir, model_name in get_test_models(): for model_dir, model_name in get_test_models():
model_label = '.'.join([model_dir, model_name]) model_label = '.'.join([model_dir, model_name])
try: # if the model was named on the command line, or
# if the model was named on the command line, or # no models were named (i.e., run all), import
# no models were named (i.e., run all), import # this model and add it to the list to test.
# this model and add it to the list to test. if not test_labels or model_name in test_labels_set:
if not test_labels or model_name in set([label.split('.')[0] for label in test_labels]): if verbosity >= 2:
if verbosity >= 2: print "Importing model %s" % model_name
print "Importing model %s" % model_name mod = load_app(model_label)
mod = load_app(model_label) if mod:
if mod: if model_label not in settings.INSTALLED_APPS:
if model_label not in settings.INSTALLED_APPS: settings.INSTALLED_APPS.append(model_label)
settings.INSTALLED_APPS.append(model_label)
except Exception, e:
sys.stderr.write("Error while importing %s:" % model_name + ''.join(traceback.format_exception(*sys.exc_info())[1:]))
continue
# Add tests for invalid models. # Add tests for invalid models.
extra_tests = [] extra_tests = []