From d0fff8ccd4d61a848314ada5b386652606d44f00 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Tue, 10 Mar 2009 05:51:06 +0000 Subject: [PATCH] Fixed #10439 -- Fixed a subtle test failure caused by r9994. Thanks to Ramiro Morales for debugging what was going on here. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10015 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/app_loading/tests.py | 23 +++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/regressiontests/app_loading/tests.py b/tests/regressiontests/app_loading/tests.py index afa3049330..444de10d79 100644 --- a/tests/regressiontests/app_loading/tests.py +++ b/tests/regressiontests/app_loading/tests.py @@ -1,18 +1,27 @@ -""" +import os +import sys +import time + +from django.conf import Settings + +__test__ = {"API_TESTS": """ Test the globbing of INSTALLED_APPS. ->>> import os, sys >>> old_sys_path = sys.path >>> sys.path.append(os.path.dirname(os.path.abspath(__file__))) ->>> from django.conf import Settings +>>> old_tz = os.environ["TZ"] +>>> settings = Settings('test_settings') ->>> s = Settings('test_settings') - ->>> s.INSTALLED_APPS +>>> settings.INSTALLED_APPS ['parent.app', 'parent.app1'] >>> sys.path = old_sys_path -""" +# Undo a side-effect of installing a new settings object. +>>> if hasattr(time, "tzset"): +... os.environ["TZ"] = old_tz +... time.tzset() + +"""}