Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #18347 -- Removed autofield raw SQL inserts from tests

  • Loading branch information...
commit 71e14cf3aa024496adcb23e83ddf13a7c5ddeb32 1 parent f51e409
@akaariai akaariai authored
Showing with 10 additions and 15 deletions.
  1. +10 −15 tests/regressiontests/transactions_regress/tests.py
View
25 tests/regressiontests/transactions_regress/tests.py
@@ -24,17 +24,15 @@ def test_raw_committed_on_success(self):
def raw_sql():
"Write a record using raw sql under a commit_on_success decorator"
cursor = connection.cursor()
- cursor.execute("INSERT into transactions_regress_mod (id,fld) values (17,18)")
+ cursor.execute("INSERT into transactions_regress_mod (fld) values (18)")
raw_sql()
# Rollback so that if the decorator didn't commit, the record is unwritten
transaction.rollback()
- try:
- # Check that the record is in the DB
- obj = Mod.objects.get(pk=17)
- self.assertEqual(obj.fld, 18)
- except Mod.DoesNotExist:
- self.fail("transaction with raw sql not committed")
+ self.assertEqual(Mod.objects.count(), 1)
+ # Check that the record is in the DB
+ obj = Mod.objects.all()[0]
+ self.assertEqual(obj.fld, 18)
def test_commit_manually_enforced(self):
"""
@@ -115,19 +113,16 @@ def reuse_cursor_ref():
be committed.
"""
cursor = connection.cursor()
- cursor.execute("INSERT into transactions_regress_mod (id,fld) values (1,2)")
+ cursor.execute("INSERT into transactions_regress_mod (fld) values (2)")
transaction.rollback()
- cursor.execute("INSERT into transactions_regress_mod (id,fld) values (1,2)")
+ cursor.execute("INSERT into transactions_regress_mod (fld) values (2)")
reuse_cursor_ref()
# Rollback so that if the decorator didn't commit, the record is unwritten
transaction.rollback()
- try:
- # Check that the record is in the DB
- obj = Mod.objects.get(pk=1)
- self.assertEqual(obj.fld, 2)
- except Mod.DoesNotExist:
- self.fail("After ending a transaction, cursor use no longer sets dirty")
+ self.assertEqual(Mod.objects.count(), 1)
+ obj = Mod.objects.all()[0]
+ self.assertEqual(obj.fld, 2)
def test_failing_query_transaction_closed(self):
"""
Please sign in to comment.
Something went wrong with that request. Please try again.