diff options
| author | Tim Graham <timograham@gmail.com> | 2016-04-07 22:04:45 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-04-08 10:12:33 -0400 |
| commit | 92053acbb9160862c3e743a99ed8ccff8d4f8fd6 (patch) | |
| tree | 50e7fd28a650f0e2352cf94f92e5a66d28a81988 /tests/contenttypes_tests | |
| parent | df8d8d4292684d6ffa7474f1e201aed486f02b53 (diff) | |
Fixed E128 flake8 warnings in tests/.
Diffstat (limited to 'tests/contenttypes_tests')
| -rw-r--r-- | tests/contenttypes_tests/test_models.py | 69 | ||||
| -rw-r--r-- | tests/contenttypes_tests/tests.py | 6 |
2 files changed, 31 insertions, 44 deletions
diff --git a/tests/contenttypes_tests/test_models.py b/tests/contenttypes_tests/test_models.py index 7644a8ea30..d388990c06 100644 --- a/tests/contenttypes_tests/test_models.py +++ b/tests/contenttypes_tests/test_models.py @@ -40,8 +40,7 @@ class ContentTypesTests(TestCase): with self.assertNumQueries(0): ContentType.objects.get_for_id(ct.id) with self.assertNumQueries(0): - ContentType.objects.get_by_natural_key('contenttypes', - 'contenttype') + ContentType.objects.get_by_natural_key('contenttypes', 'contenttype') # Once we clear the cache, another lookup will again hit the DB ContentType.objects.clear_cache() @@ -51,12 +50,10 @@ class ContentTypesTests(TestCase): # The same should happen with a lookup by natural key ContentType.objects.clear_cache() with self.assertNumQueries(1): - ContentType.objects.get_by_natural_key('contenttypes', - 'contenttype') + ContentType.objects.get_by_natural_key('contenttypes', 'contenttype') # And a second hit shouldn't hit the DB with self.assertNumQueries(0): - ContentType.objects.get_by_natural_key('contenttypes', - 'contenttype') + ContentType.objects.get_by_natural_key('contenttypes', 'contenttype') def test_get_for_models_empty_cache(self): # Empty cache. @@ -94,17 +91,10 @@ class ContentTypesTests(TestCase): with concrete, proxy and deferred models """ concrete_model_ct = ContentType.objects.get_for_model(ConcreteModel) + self.assertEqual(concrete_model_ct, ContentType.objects.get_for_model(ProxyModel)) + self.assertEqual(concrete_model_ct, ContentType.objects.get_for_model(ConcreteModel, for_concrete_model=False)) - self.assertEqual(concrete_model_ct, - ContentType.objects.get_for_model(ProxyModel)) - - self.assertEqual(concrete_model_ct, - ContentType.objects.get_for_model(ConcreteModel, - for_concrete_model=False)) - - proxy_model_ct = ContentType.objects.get_for_model(ProxyModel, - for_concrete_model=False) - + proxy_model_ct = ContentType.objects.get_for_model(ProxyModel, for_concrete_model=False) self.assertNotEqual(concrete_model_ct, proxy_model_ct) # Make sure deferred model are correctly handled @@ -112,19 +102,16 @@ class ContentTypesTests(TestCase): DeferredConcreteModel = ConcreteModel.objects.only('pk').get().__class__ DeferredProxyModel = ProxyModel.objects.only('pk').get().__class__ - self.assertEqual(concrete_model_ct, - ContentType.objects.get_for_model(DeferredConcreteModel)) - - self.assertEqual(concrete_model_ct, - ContentType.objects.get_for_model(DeferredConcreteModel, - for_concrete_model=False)) - - self.assertEqual(concrete_model_ct, - ContentType.objects.get_for_model(DeferredProxyModel)) - - self.assertEqual(proxy_model_ct, - ContentType.objects.get_for_model(DeferredProxyModel, - for_concrete_model=False)) + self.assertEqual(concrete_model_ct, ContentType.objects.get_for_model(DeferredConcreteModel)) + self.assertEqual( + concrete_model_ct, + ContentType.objects.get_for_model(DeferredConcreteModel, for_concrete_model=False) + ) + self.assertEqual(concrete_model_ct, ContentType.objects.get_for_model(DeferredProxyModel)) + self.assertEqual( + proxy_model_ct, + ContentType.objects.get_for_model(DeferredProxyModel, for_concrete_model=False) + ) def test_get_for_concrete_models(self): """ @@ -139,10 +126,8 @@ class ContentTypesTests(TestCase): ProxyModel: concrete_model_ct, }) - proxy_model_ct = ContentType.objects.get_for_model(ProxyModel, - for_concrete_model=False) - cts = ContentType.objects.get_for_models(ConcreteModel, ProxyModel, - for_concrete_models=False) + proxy_model_ct = ContentType.objects.get_for_model(ProxyModel, for_concrete_model=False) + cts = ContentType.objects.get_for_models(ConcreteModel, ProxyModel, for_concrete_models=False) self.assertEqual(cts, { ConcreteModel: concrete_model_ct, ProxyModel: proxy_model_ct, @@ -153,16 +138,15 @@ class ContentTypesTests(TestCase): DeferredConcreteModel = ConcreteModel.objects.only('pk').get().__class__ DeferredProxyModel = ProxyModel.objects.only('pk').get().__class__ - cts = ContentType.objects.get_for_models(DeferredConcreteModel, - DeferredProxyModel) + cts = ContentType.objects.get_for_models(DeferredConcreteModel, DeferredProxyModel) self.assertEqual(cts, { DeferredConcreteModel: concrete_model_ct, DeferredProxyModel: concrete_model_ct, }) - cts = ContentType.objects.get_for_models(DeferredConcreteModel, - DeferredProxyModel, - for_concrete_models=False) + cts = ContentType.objects.get_for_models( + DeferredConcreteModel, DeferredProxyModel, for_concrete_models=False + ) self.assertEqual(cts, { DeferredConcreteModel: concrete_model_ct, DeferredProxyModel: proxy_model_ct, @@ -198,13 +182,14 @@ class ContentTypesTests(TestCase): with self.modify_settings(INSTALLED_APPS={'append': 'django.contrib.sites'}): response = shortcut(request, user_ct.id, obj.id) - self.assertEqual("http://%s/users/john/" % get_current_site(request).domain, - response._headers.get("location")[1]) + self.assertEqual( + "http://%s/users/john/" % get_current_site(request).domain, + response._headers.get("location")[1] + ) with self.modify_settings(INSTALLED_APPS={'remove': 'django.contrib.sites'}): response = shortcut(request, user_ct.id, obj.id) - self.assertEqual("http://Example.com/users/john/", - response._headers.get("location")[1]) + self.assertEqual("http://Example.com/users/john/", response._headers.get("location")[1]) def test_shortcut_view_without_get_absolute_url(self): """ diff --git a/tests/contenttypes_tests/tests.py b/tests/contenttypes_tests/tests.py index 7000c6fe48..c2377bf82e 100644 --- a/tests/contenttypes_tests/tests.py +++ b/tests/contenttypes_tests/tests.py @@ -252,9 +252,11 @@ class GenericRelationshipTests(SimpleTestCase): 'custom_content_type', 'custom_object_id') class Bookmark(models.Model): - tags = GenericRelation('TaggedItem', + tags = GenericRelation( + 'TaggedItem', content_type_field='custom_content_type', - object_id_field='custom_object_id') + object_id_field='custom_object_id', + ) errors = Bookmark.tags.field.check() self.assertEqual(errors, []) |
