Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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
  • Loading branch information...
commit ea350187a5dc52861d85d513c846bd1f062513be 1 parent c545e88
@malcolmt malcolmt authored
Showing with 16 additions and 7 deletions.
  1. +16 −7 tests/regressiontests/app_loading/tests.py
View
23 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()
+
+"""}

0 comments on commit ea35018

Please sign in to comment.
Something went wrong with that request. Please try again.