Browse files

Stopped a test from executing queries at the module level.

Currently module level queries are executed against the real database
(specified in NAME) instead of the test database; since it is to late
to fix this for 1.6, we at least ensures stable builds. Refs #21443.
  • Loading branch information...
1 parent e6c0020 commit 4fcc1e4ad8d153f41132b171c231b6d5d4086c28 @apollo13 apollo13 committed Sep 22, 2013
Showing with 6 additions and 4 deletions.
  1. +6 −4 tests/transactions_regress/
@@ -1,6 +1,6 @@
from __future__ import unicode_literals
-from unittest import skipIf, skipUnless
+from unittest import skipIf, skipUnless, SkipTest
from django.db import (connection, connections, transaction, DEFAULT_DB_ALIAS, DatabaseError,
@@ -367,11 +367,13 @@ def work():
@skipIf(connection.vendor == 'sqlite',
"SQLite doesn't support savepoints in managed mode")
- @skipIf(connection.vendor == 'mysql' and
- connection.features._mysql_storage_engine == 'MyISAM',
- "MyISAM MySQL storage engine doesn't support savepoints")
def test_savepoint_rollback(self):
+ # _mysql_storage_engine issues a query and as such can't be applied in
+ # a skipIf decorator since that would execute the query on module load.
+ if (connection.vendor == 'mysql' and
+ connection.features._mysql_storage_engine == 'MyISAM'):
+ raise SkipTest("MyISAM MySQL storage engine doesn't support savepoints")
def work():
mod = Mod.objects.create(fld=1)

0 comments on commit 4fcc1e4

Please sign in to comment.