summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/cache/tests.py4
-rw-r--r--tests/check_framework/test_model_checks.py12
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/cache/tests.py b/tests/cache/tests.py
index 1f0abc8434..75fd7853de 100644
--- a/tests/cache/tests.py
+++ b/tests/cache/tests.py
@@ -1272,8 +1272,8 @@ class BaseMemcachedTests(BaseCacheTests):
def _perform_invalid_key_test(self, key, expected_warning):
"""
- Whilst other backends merely warn, memcached should raise for an
- invalid key.
+ While other backends merely warn, memcached should raise for an invalid
+ key.
"""
msg = expected_warning.replace(key, cache.make_key(key))
with self.assertRaisesMessage(InvalidCacheKey, msg):
diff --git a/tests/check_framework/test_model_checks.py b/tests/check_framework/test_model_checks.py
index 02c36dc610..ce2d73fa20 100644
--- a/tests/check_framework/test_model_checks.py
+++ b/tests/check_framework/test_model_checks.py
@@ -161,7 +161,7 @@ class IndexNameTests(SimpleTestCase):
self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [
Error(
- "index name 'foo' is not unique amongst models: "
+ "index name 'foo' is not unique among models: "
"check_framework.Model1, check_framework.Model2.",
id='models.E030',
),
@@ -181,7 +181,7 @@ class IndexNameTests(SimpleTestCase):
self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [
Error(
- "index name 'foo' is not unique amongst models: "
+ "index name 'foo' is not unique among models: "
"check_framework.Model1, check_framework.Model2.",
id='models.E030',
),
@@ -220,7 +220,7 @@ class IndexNameTests(SimpleTestCase):
self.assertEqual(checks.run_checks(app_configs=apps.get_app_configs()), [
Error(
- "index name 'foo' is not unique amongst models: basic.Model1, "
+ "index name 'foo' is not unique among models: basic.Model1, "
"check_framework.Model2.",
id='models.E030',
),
@@ -277,7 +277,7 @@ class ConstraintNameTests(TestCase):
self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [
Error(
- "constraint name 'foo' is not unique amongst models: "
+ "constraint name 'foo' is not unique among models: "
"check_framework.Model1, check_framework.Model2.",
id='models.E032',
),
@@ -297,7 +297,7 @@ class ConstraintNameTests(TestCase):
self.assertEqual(checks.run_checks(app_configs=self.apps.get_app_configs()), [
Error(
- "constraint name 'foo' is not unique amongst models: "
+ "constraint name 'foo' is not unique among models: "
"check_framework.Model1, check_framework.Model2.",
id='models.E032',
),
@@ -336,7 +336,7 @@ class ConstraintNameTests(TestCase):
self.assertEqual(checks.run_checks(app_configs=apps.get_app_configs()), [
Error(
- "constraint name 'foo' is not unique amongst models: "
+ "constraint name 'foo' is not unique among models: "
"basic.Model1, check_framework.Model2.",
id='models.E032',
),