Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #12574 -- Removed an unnecessary exception catch from t…

…he system runtest script, which could hide failing tests. Thanks to CarlFK for the report, and Ramiro Morales for the polish.

Backport of r13616 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 1c3e3d3dba0a833981ed39da42e0bed015400d40 1 parent c3b13d8
Russell Keith-Magee freakboy3742 authored
Showing with 11 additions and 14 deletions.
  1. +11 −14 tests/runtests.py
25 tests/runtests.py
View
@@ -122,22 +122,19 @@ def django_tests(verbosity, interactive, failfast, test_labels):
get_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():
model_label = '.'.join([model_dir, model_name])
- try:
- # if the model was named on the command line, or
- # no models were named (i.e., run all), import
- # this model and add it to the list to test.
- if not test_labels or model_name in set([label.split('.')[0] for label in test_labels]):
- if verbosity >= 1:
- print "Importing model %s" % model_name
- mod = load_app(model_label)
- if mod:
- if model_label not in settings.INSTALLED_APPS:
- 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
+ # if the model was named on the command line, or
+ # no models were named (i.e., run all), import
+ # this model and add it to the list to test.
+ if not test_labels or model_name in test_labels_set:
+ if verbosity >= 1:
+ print "Importing model %s" % model_name
+ mod = load_app(model_label)
+ if mod:
+ if model_label not in settings.INSTALLED_APPS:
+ settings.INSTALLED_APPS.append(model_label)
# Add tests for invalid models.
extra_tests = []
Please sign in to comment.
Something went wrong with that request. Please try again.