Commit 1c3e3d3d authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Fixed #12574 -- Removed an unnecessary exception catch from the system... 

[1.2.X] 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.

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
parent c3b13d8f

tests/runtests.py

+11 −14
Original line number Diff line number Diff line
@@ -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 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)

        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.

    extra_tests = []