p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Translated a test to English for consistency. 

Also fixed a typo.
This commit is contained in:
Aymeric Augustin 2013-09-22 21:20:22 +02:00
parent 2ca00faa91
commit e6c0020d19
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/get_or_create/tests.py
View File

@ -177,7 +177,7 @@ class UpdateOrCreateTests(TestCase):
self.assertRaises(IntegrityError, self.assertRaises(IntegrityError,
Person.objects.update_or_create, first_name="Tom", last_name="Smith") Person.objects.update_or_create, first_name="Tom", last_name="Smith")
def test_mananual_primary_key_test(self): def test_manual_primary_key_test(self):
# If you specify an existing primary key, but different other fields, # If you specify an existing primary key, but different other fields,
# then you will get an error and data will not be updated. # then you will get an error and data will not be updated.
ManualPrimaryKeyTest.objects.create(id=1, data="Original") ManualPrimaryKeyTest.objects.create(id=1, data="Original")

4
tests/transactions/tests.py
View File

@ -265,7 +265,7 @@ class AtomicMergeTests(TransactionTestCase):
Reporter.objects.create(first_name="Archibald", last_name="Haddock") Reporter.objects.create(first_name="Archibald", last_name="Haddock")
with six.assertRaisesRegex(self, Exception, "Oops"): with six.assertRaisesRegex(self, Exception, "Oops"):
with transaction.atomic(savepoint=False): with transaction.atomic(savepoint=False):
Reporter.objects.create(first_name="Tournesol") Reporter.objects.create(first_name="Calculus")
raise Exception("Oops, that's his last name") raise Exception("Oops, that's his last name")
# It wasn't possible to roll back # It wasn't possible to roll back
self.assertEqual(Reporter.objects.count(), 3) self.assertEqual(Reporter.objects.count(), 3)
@ -281,7 +281,7 @@ class AtomicMergeTests(TransactionTestCase):
Reporter.objects.create(first_name="Archibald", last_name="Haddock") Reporter.objects.create(first_name="Archibald", last_name="Haddock")
with six.assertRaisesRegex(self, Exception, "Oops"): with six.assertRaisesRegex(self, Exception, "Oops"):
with transaction.atomic(savepoint=False): with transaction.atomic(savepoint=False):
Reporter.objects.create(first_name="Tournesol") Reporter.objects.create(first_name="Calculus")
raise Exception("Oops, that's his last name") raise Exception("Oops, that's his last name")
# It wasn't possible to roll back # It wasn't possible to roll back
self.assertEqual(Reporter.objects.count(), 3) self.assertEqual(Reporter.objects.count(), 3)