summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-11-02 05:21:48 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-11-02 05:21:48 +0000
commit909c44e1aa8c216e748ef85d27ab8b686fe61d46 (patch)
treec17f1c70fc7a980842fb50bfb9d30a1fb19c3bcf
parentc10d41c821808760e0e9193b1bea57213300811e (diff)
Migrated app_loading doctests.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--tests/regressiontests/app_loading/tests.py29
1 files changed, 13 insertions, 16 deletions
diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py
index 77aeb9a5d1..ee7191786b 100644
--- a/tests/regressiontests/app_loading/tests.py
+++ b/tests/regressiontests/app_loading/tests.py
@@ -7,26 +7,23 @@ from django.conf import Settings
from django.db.models.loading import cache, load_app
from django.utils.unittest import TestCase
-__test__ = {"API_TESTS": """
-Test the globbing of INSTALLED_APPS.
->>> old_sys_path = sys.path
->>> sys.path.append(os.path.dirname(os.path.abspath(__file__)))
-
->>> old_tz = os.environ.get("TZ")
->>> settings = Settings('test_settings')
-
->>> settings.INSTALLED_APPS
-['parent.app', 'parent.app1', 'parent.app_2']
+class InstalledAppsGlobbingTest(TestCase):
+ def setUp(self):
+ self.OLD_SYS_PATH = sys.path
+ sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+ self.OLD_TZ = os.environ.get("TZ")
->>> sys.path = old_sys_path
+ def test_globbing(self):
+ settings = Settings('test_settings')
+ self.assertEquals(settings.INSTALLED_APPS, ['parent.app', 'parent.app1', 'parent.app_2'])
-# Undo a side-effect of installing a new settings object.
->>> if hasattr(time, "tzset") and old_tz:
-... os.environ["TZ"] = old_tz
-... time.tzset()
+ def tearDown(self):
+ sys.path = self.OLD_SYS_PATH
+ if hasattr(time, "tzset") and self.OLD_TZ:
+ os.environ["TZ"] = self.OLD_TZ
+ time.tzset()
-"""}
class EggLoadingTest(TestCase):