From e6c0020d1973abf168c3a2357ab4cf44fa2d47ca Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Sun, 22 Sep 2013 21:20:22 +0200
Subject: [PATCH] Translated a test to English for consistency.
Also fixed a typo.
---
tests/get_or_create/tests.py | 2 +-
tests/transactions/tests.py | 4 ++--
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)