From 9af56803f53a4e41bb826d4e293ef8650ad9f13a Mon Sep 17 00:00:00 2001 From: Gary Wilson Jr Date: Tue, 23 Dec 2008 18:25:24 +0000 Subject: Fixed #8245 -- Added a LOADING flag to autodiscover to prevent an admin.py module with errors from raising a spurious AlreadyRegistered exception in a subsequent call to autodiscover. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9680 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/bug8245/__init__.py | 0 tests/regressiontests/bug8245/admin.py | 7 +++++++ tests/regressiontests/bug8245/models.py | 4 ++++ tests/regressiontests/bug8245/tests.py | 23 +++++++++++++++++++++++ 4 files changed, 34 insertions(+) create mode 100644 tests/regressiontests/bug8245/__init__.py create mode 100644 tests/regressiontests/bug8245/admin.py create mode 100644 tests/regressiontests/bug8245/models.py create mode 100644 tests/regressiontests/bug8245/tests.py (limited to 'tests/regressiontests/bug8245') diff --git a/tests/regressiontests/bug8245/__init__.py b/tests/regressiontests/bug8245/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/bug8245/admin.py b/tests/regressiontests/bug8245/admin.py new file mode 100644 index 0000000000..18122696b6 --- /dev/null +++ b/tests/regressiontests/bug8245/admin.py @@ -0,0 +1,7 @@ +from django.contrib import admin + +from models import Story + + +admin.site.register(Story) +raise Exception("Bad admin module") diff --git a/tests/regressiontests/bug8245/models.py b/tests/regressiontests/bug8245/models.py new file mode 100644 index 0000000000..5643955df3 --- /dev/null +++ b/tests/regressiontests/bug8245/models.py @@ -0,0 +1,4 @@ +from django.db import models + +class Story(models.Model): + title = models.CharField(max_length=10) diff --git a/tests/regressiontests/bug8245/tests.py b/tests/regressiontests/bug8245/tests.py new file mode 100644 index 0000000000..c1cc3b595c --- /dev/null +++ b/tests/regressiontests/bug8245/tests.py @@ -0,0 +1,23 @@ +from unittest import TestCase + +from django.contrib import admin + + +class Bug8245Test(TestCase): + """ + Test for bug #8245 - don't raise an AlreadyRegistered exception when using + autodiscover() and an admin.py module contains an error. + """ + + def test_bug_8245(self): + # The first time autodiscover is called, we should get our real error. + try: + admin.autodiscover() + except Exception, e: + self.failUnlessEqual(str(e), "Bad admin module") + else: + self.fail( + 'autodiscover should have raised a "Bad admin module" error.') + # Calling autodiscover again should bail out early and not raise an + # AlreadyRegistered error. + admin.autodiscover() -- cgit v1.3