mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 09:06:13 +00:00
Code Issues 32 Releases Wiki Activity

[1.6.x] Fixed a test isolation issue. Refs #17062.

Browse Source 
This test could change settings.DATABASES['default']['TIME_ZONE'] and
didn't restore the previous value.

Backport of 1c24096f from master.
This commit is contained in:
Aymeric Augustin
2014-01-12 18:24:04 +01:00
parent 6728f159f0
commit b79bf9c7a9
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/backends/tests.py
View File

@@ -2,6 +2,7 @@
# Unit and doctests for specific database backends. # Unit and doctests for specific database backends.
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
import copy
import datetime import datetime
from decimal import Decimal from decimal import Decimal
import threading import threading
@@ -315,16 +316,18 @@ class PostgresVersionTest(TestCase):
self.assertEqual(pg_version.get_version(conn), 80300) self.assertEqual(pg_version.get_version(conn), 80300)
class PostgresNewConnectionTest(TestCase): class PostgresNewConnectionTests(TestCase):
"""
#17062: PostgreSQL shouldn't roll back SET TIME ZONE, even if the first
transaction is rolled back.
"""
@unittest.skipUnless( @unittest.skipUnless(
connection.vendor == 'postgresql', connection.vendor == 'postgresql',
"This test applies only to PostgreSQL") "This test applies only to PostgreSQL")
def test_connect_and_rollback(self): def test_connect_and_rollback(self):
new_connections = ConnectionHandler(settings.DATABASES) """
PostgreSQL shouldn't roll back SET TIME ZONE, even if the first
transaction is rolled back (#17062).
"""
databases = copy.deepcopy(settings.DATABASES)
new_connections = ConnectionHandler(databases)
new_connection = new_connections[DEFAULT_DB_ALIAS] new_connection = new_connections[DEFAULT_DB_ALIAS]
try: try:
# Ensure the database default time zone is different than # Ensure the database default time zone is different than