summaryrefslogtreecommitdiff
path: root/tests/invalid_models_tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2016-04-07 22:04:45 -0400
committerTim Graham <timograham@gmail.com>2016-04-08 10:12:33 -0400
commit92053acbb9160862c3e743a99ed8ccff8d4f8fd6 (patch)
tree50e7fd28a650f0e2352cf94f92e5a66d28a81988 /tests/invalid_models_tests
parentdf8d8d4292684d6ffa7474f1e201aed486f02b53 (diff)
Fixed E128 flake8 warnings in tests/.
Diffstat (limited to 'tests/invalid_models_tests')
-rw-r--r--tests/invalid_models_tests/test_models.py20
-rw-r--r--tests/invalid_models_tests/test_relative_fields.py39
2 files changed, 31 insertions, 28 deletions
diff --git a/tests/invalid_models_tests/test_models.py b/tests/invalid_models_tests/test_models.py
index e5d5406cc4..e4b3105574 100644
--- a/tests/invalid_models_tests/test_models.py
+++ b/tests/invalid_models_tests/test_models.py
@@ -267,8 +267,7 @@ class FieldNamesTests(SimpleTestCase):
max_column_name_length, column_limit_db_alias = get_max_column_name_length()
- @unittest.skipIf(max_column_name_length is None,
- "The database doesn't have a column name length limit.")
+ @unittest.skipIf(max_column_name_length is None, "The database doesn't have a column name length limit.")
def test_M2M_long_column_name(self):
"""
#13711 -- Model check for long M2M column names when database has
@@ -333,8 +332,8 @@ class FieldNamesTests(SimpleTestCase):
'Autogenerated column name too long for M2M field "%s". '
'Maximum length is "%s" for database "%s".'
% (m2m_long_name, self.max_column_name_length, self.column_limit_db_alias),
- hint=("Use 'through' to create a separate model for "
- "M2M and then set column_name using 'db_column'."),
+ hint="Use 'through' to create a separate model for "
+ "M2M and then set column_name using 'db_column'.",
obj=ModelWithLongField,
id='models.E019',
)
@@ -350,8 +349,8 @@ class FieldNamesTests(SimpleTestCase):
'Autogenerated column name too long for M2M field "%s_id". '
'Maximum length is "%s" for database "%s".'
% (long_field_name, self.max_column_name_length, self.column_limit_db_alias),
- hint=("Use 'through' to create a separate model for "
- "M2M and then set column_name using 'db_column'."),
+ hint="Use 'through' to create a separate model for "
+ "M2M and then set column_name using 'db_column'.",
obj=ModelWithLongField,
id='models.E019',
)
@@ -359,8 +358,7 @@ class FieldNamesTests(SimpleTestCase):
self.assertEqual(errors, expected)
- @unittest.skipIf(max_column_name_length is None,
- "The database doesn't have a column name length limit.")
+ @unittest.skipIf(max_column_name_length is None, "The database doesn't have a column name length limit.")
def test_local_field_long_column_name(self):
"""
#13711 -- Model check for long column names
@@ -724,10 +722,8 @@ class OtherModelTests(SimpleTestCase):
pass
class Group(models.Model):
- primary = models.ManyToManyField(Person,
- through="Membership", related_name="primary")
- secondary = models.ManyToManyField(Person, through="Membership",
- related_name="secondary")
+ primary = models.ManyToManyField(Person, through="Membership", related_name="primary")
+ secondary = models.ManyToManyField(Person, through="Membership", related_name="secondary")
class Membership(models.Model):
person = models.ForeignKey(Person, models.CASCADE)
diff --git a/tests/invalid_models_tests/test_relative_fields.py b/tests/invalid_models_tests/test_relative_fields.py
index 6a61248eb6..8b95cf3e18 100644
--- a/tests/invalid_models_tests/test_relative_fields.py
+++ b/tests/invalid_models_tests/test_relative_fields.py
@@ -858,8 +858,7 @@ class AccessorClashTests(SimpleTestCase):
pass
class Model(models.Model):
- children = models.ManyToManyField('Child',
- related_name="m2m_clash", related_query_name="no_clash")
+ children = models.ManyToManyField('Child', related_name="m2m_clash", related_query_name="no_clash")
class Parent(models.Model):
m2m_clash = models.ManyToManyField('Target')
@@ -1013,10 +1012,13 @@ class ExplicitRelatedQueryNameClashTests(SimpleTestCase):
def test_fk_to_integer(self, related_name=None):
self._test_explicit_related_query_name_clash(
target=models.IntegerField(),
- relative=models.ForeignKey('Target',
+ relative=models.ForeignKey(
+ 'Target',
models.CASCADE,
related_name=related_name,
- related_query_name='clash'))
+ related_query_name='clash',
+ )
+ )
def test_hidden_fk_to_integer(self, related_name=None):
self.test_fk_to_integer(related_name='+')
@@ -1024,10 +1026,13 @@ class ExplicitRelatedQueryNameClashTests(SimpleTestCase):
def test_fk_to_fk(self, related_name=None):
self._test_explicit_related_query_name_clash(
target=models.ForeignKey('Another', models.CASCADE),
- relative=models.ForeignKey('Target',
+ relative=models.ForeignKey(
+ 'Target',
models.CASCADE,
related_name=related_name,
- related_query_name='clash'))
+ related_query_name='clash',
+ )
+ )
def test_hidden_fk_to_fk(self):
self.test_fk_to_fk(related_name='+')
@@ -1035,10 +1040,13 @@ class ExplicitRelatedQueryNameClashTests(SimpleTestCase):
def test_fk_to_m2m(self, related_name=None):
self._test_explicit_related_query_name_clash(
target=models.ManyToManyField('Another'),
- relative=models.ForeignKey('Target',
+ relative=models.ForeignKey(
+ 'Target',
models.CASCADE,
related_name=related_name,
- related_query_name='clash'))
+ related_query_name='clash',
+ )
+ )
def test_hidden_fk_to_m2m(self):
self.test_fk_to_m2m(related_name='+')
@@ -1046,9 +1054,7 @@ class ExplicitRelatedQueryNameClashTests(SimpleTestCase):
def test_m2m_to_integer(self, related_name=None):
self._test_explicit_related_query_name_clash(
target=models.IntegerField(),
- relative=models.ManyToManyField('Target',
- related_name=related_name,
- related_query_name='clash'))
+ relative=models.ManyToManyField('Target', related_name=related_name, related_query_name='clash'))
def test_hidden_m2m_to_integer(self):
self.test_m2m_to_integer(related_name='+')
@@ -1056,9 +1062,7 @@ class ExplicitRelatedQueryNameClashTests(SimpleTestCase):
def test_m2m_to_fk(self, related_name=None):
self._test_explicit_related_query_name_clash(
target=models.ForeignKey('Another', models.CASCADE),
- relative=models.ManyToManyField('Target',
- related_name=related_name,
- related_query_name='clash'))
+ relative=models.ManyToManyField('Target', related_name=related_name, related_query_name='clash'))
def test_hidden_m2m_to_fk(self):
self.test_m2m_to_fk(related_name='+')
@@ -1066,9 +1070,12 @@ class ExplicitRelatedQueryNameClashTests(SimpleTestCase):
def test_m2m_to_m2m(self, related_name=None):
self._test_explicit_related_query_name_clash(
target=models.ManyToManyField('Another'),
- relative=models.ManyToManyField('Target',
+ relative=models.ManyToManyField(
+ 'Target',
related_name=related_name,
- related_query_name='clash'))
+ related_query_name='clash',
+ )
+ )
def test_hidden_m2m_to_m2m(self):
self.test_m2m_to_m2m(related_name='+')