Skip to content

Commit

Permalink
Some style fixes for stuff that was clearly brough tover from doctests.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Gaynor committed Feb 23, 2013
1 parent cf890c1 commit 150e202
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
3 changes: 3 additions & 0 deletions tests/regressiontests/transactions_regress/models.py
@@ -1,10 +1,13 @@
from django.db import models from django.db import models



class Mod(models.Model): class Mod(models.Model):
fld = models.IntegerField() fld = models.IntegerField()



class M2mA(models.Model): class M2mA(models.Model):
others = models.ManyToManyField('M2mB') others = models.ManyToManyField('M2mB')



class M2mB(models.Model): class M2mB(models.Model):
fld = models.IntegerField() fld = models.IntegerField()
14 changes: 7 additions & 7 deletions tests/regressiontests/transactions_regress/tests.py
Expand Up @@ -42,7 +42,7 @@ def test_commit_manually_enforced(self):
@commit_manually @commit_manually
def non_comitter(): def non_comitter():
"Execute a managed transaction with read-only operations and fail to commit" "Execute a managed transaction with read-only operations and fail to commit"
_ = Mod.objects.count() Mod.objects.count()


self.assertRaises(TransactionManagementError, non_comitter) self.assertRaises(TransactionManagementError, non_comitter)


Expand All @@ -56,7 +56,7 @@ def committer():
""" """
Perform a database query, then commit the transaction Perform a database query, then commit the transaction
""" """
_ = Mod.objects.count() Mod.objects.count()
transaction.commit() transaction.commit()


try: try:
Expand All @@ -74,7 +74,7 @@ def roller_back():
""" """
Perform a database query, then rollback the transaction Perform a database query, then rollback the transaction
""" """
_ = Mod.objects.count() Mod.objects.count()
transaction.rollback() transaction.rollback()


try: try:
Expand All @@ -90,9 +90,9 @@ def test_commit_manually_enforced_after_commit(self):
@commit_manually @commit_manually
def fake_committer(): def fake_committer():
"Query, commit, then query again, leaving with a pending transaction" "Query, commit, then query again, leaving with a pending transaction"
_ = Mod.objects.count() Mod.objects.count()
transaction.commit() transaction.commit()
_ = Mod.objects.count() Mod.objects.count()


self.assertRaises(TransactionManagementError, fake_committer) self.assertRaises(TransactionManagementError, fake_committer)


Expand Down Expand Up @@ -239,7 +239,7 @@ def work():
mod = Mod.objects.create(fld=1) mod = Mod.objects.create(fld=1)
pk = mod.pk pk = mod.pk
sid = transaction.savepoint() sid = transaction.savepoint()
mod1 = Mod.objects.filter(pk=pk).update(fld=10) Mod.objects.filter(pk=pk).update(fld=10)
transaction.savepoint_commit(sid) transaction.savepoint_commit(sid)
mod2 = Mod.objects.get(pk=pk) mod2 = Mod.objects.get(pk=pk)
transaction.commit() transaction.commit()
Expand All @@ -257,7 +257,7 @@ def work():
mod = Mod.objects.create(fld=1) mod = Mod.objects.create(fld=1)
pk = mod.pk pk = mod.pk
sid = transaction.savepoint() sid = transaction.savepoint()
mod1 = Mod.objects.filter(pk=pk).update(fld=20) Mod.objects.filter(pk=pk).update(fld=20)
transaction.savepoint_rollback(sid) transaction.savepoint_rollback(sid)
mod2 = Mod.objects.get(pk=pk) mod2 = Mod.objects.get(pk=pk)
transaction.commit() transaction.commit()
Expand Down

0 comments on commit 150e202

Please sign in to comment.