Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #17882 -- Reopened the database connection when a test changes …

…time zone settings. Thanks brodie for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17699 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit aa900c39a8e3134d09e2285cce030c1b33b1e820 1 parent f7daa38
@aaugustin aaugustin authored
Showing with 9 additions and 2 deletions.
  1. +9 −0 django/test/signals.py
  2. +0 −2  tests/modeltests/timezones/tests.py
View
9 django/test/signals.py
@@ -1,5 +1,14 @@
+from django.conf import settings
+from django.db import close_connection
from django.dispatch import Signal
template_rendered = Signal(providing_args=["template", "context"])
setting_changed = Signal(providing_args=["setting", "value"])
+
+# Close the database connection to re-establish it with the proper time zone.
+def close_connection_on_time_zone_change(**kwargs):
+ if (kwargs['setting'] == 'USE_TZ'
+ or (kwargs['setting'] == 'TIME_ZONE' and not settings.USE_TZ)):
+ close_connection()
+setting_changed.connect(close_connection_on_time_zone_change)
View
2  tests/modeltests/timezones/tests.py
@@ -63,8 +63,6 @@ def setUpClass(self):
self._old_tz = os.environ.get('TZ')
os.environ['TZ'] = 'Africa/Nairobi'
time.tzset()
- # Create a new cursor, for test cases that change the value of USE_TZ.
- connection.close()
@classmethod
def tearDownClass(self):
Please sign in to comment.
Something went wrong with that request. Please try again.