Skip to content

Commit

Permalink
[1.2.X] Made a transaction test optional unless transactions are supp…
Browse files Browse the repository at this point in the history
…orted.

Backport of r15325 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information
freakboy3742 committed Jan 26, 2011
1 parent 3af1bf8 commit 167d1cb
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions tests/regressiontests/fixtures_regress/tests.py
Expand Up @@ -611,7 +611,8 @@ def ticket_11101(self):
transaction.rollback()
self.assertEqual(Thingy.objects.count(), 0)

def test_ticket_11101(self):
"""Test that fixtures can be rolled back (ticket #11101)."""
ticket_11101 = transaction.commit_manually(self.ticket_11101)
ticket_11101()
if settings.DATABASES[DEFAULT_DB_ALIAS]['ENGINE'] != 'django.db.backends.mysql':
def test_ticket_11101(self):
"""Test that fixtures can be rolled back (ticket #11101)."""
ticket_11101 = transaction.commit_manually(self.ticket_11101)
ticket_11101()

0 comments on commit 167d1cb

Please sign in to comment.