summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAymeric Augustin <aymeric.augustin@m4x.org>2013-09-22 21:20:22 +0200
committerAymeric Augustin <aymeric.augustin@m4x.org>2013-09-22 22:48:22 +0200
commite6c0020d1973abf168c3a2357ab4cf44fa2d47ca (patch)
tree098ef1341f81e84995deeb2eec3c9124bafadeca
parent2ca00faa913754cd5860f6e1f23c8da2529c691a (diff)
Translated a test to English for consistency.
Also fixed a typo.
-rw-r--r--tests/get_or_create/tests.py2
-rw-r--r--tests/transactions/tests.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/get_or_create/tests.py b/tests/get_or_create/tests.py
index a612ea60a0..9c0d17a4d9 100644
--- a/tests/get_or_create/tests.py
+++ b/tests/get_or_create/tests.py
@@ -177,7 +177,7 @@ class UpdateOrCreateTests(TestCase):
self.assertRaises(IntegrityError,
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,
# then you will get an error and data will not be updated.
ManualPrimaryKeyTest.objects.create(id=1, data="Original")
diff --git a/tests/transactions/tests.py b/tests/transactions/tests.py
index 9cf8b4d742..70a77b719e 100644
--- a/tests/transactions/tests.py
+++ b/tests/transactions/tests.py
@@ -265,7 +265,7 @@ class AtomicMergeTests(TransactionTestCase):
Reporter.objects.create(first_name="Archibald", last_name="Haddock")
with six.assertRaisesRegex(self, Exception, "Oops"):
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")
# It wasn't possible to roll back
self.assertEqual(Reporter.objects.count(), 3)
@@ -281,7 +281,7 @@ class AtomicMergeTests(TransactionTestCase):
Reporter.objects.create(first_name="Archibald", last_name="Haddock")
with six.assertRaisesRegex(self, Exception, "Oops"):
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")
# It wasn't possible to roll back
self.assertEqual(Reporter.objects.count(), 3)