Commit ea350187 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

[1.0.X] Fixed #10439 -- Fixed a subtle test failure caused by r9995. 

Thanks to Ramiro Morales for debugging what was going on here.

Backport of r10015 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10016 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent c545e88b

tests/regressiontests/app_loading/tests.py

+16 −7
Original line number Diff line number Diff line 
"""

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()



"""}