From 78a2719def81befc494a8b91510391e6b6f101e2 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Sun, 20 Nov 2011 20:43:59 +0000 Subject: [PATCH] Tweaked the skipping condition for the test introduced in r17128 so that it works on non-PostgreSQL backends. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17129 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/backends/tests.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/regressiontests/backends/tests.py b/tests/regressiontests/backends/tests.py index a37d5660481..936f0101866 100644 --- a/tests/regressiontests/backends/tests.py +++ b/tests/regressiontests/backends/tests.py @@ -235,10 +235,9 @@ class PostgresNewConnectionTest(TestCase): #17062: PostgreSQL shouldn't roll back SET TIME ZONE, even if the first transaction is rolled back. """ - @unittest.skipUnless(connection.vendor == 'postgresql', - "Test valid only for PostgreSQL") - @unittest.skipUnless(connection.isolation_level > 0, - "Test valid only if not using autocommit") + @unittest.skipUnless( + connection.vendor == 'postgresql' and connection.isolation_level > 0, + "This test applies only to PostgreSQL without autocommit") def test_connect_and_rollback(self): new_connections = ConnectionHandler(settings.DATABASES) new_connection = new_connections[DEFAULT_DB_ALIAS]