Briq
/
django-polymorphic
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve tests to use a unified qrepr() output

fix_request_path_info
Diederik van der Boor 2017-05-01 12:33:44 +02:00
parent 61b398115b
commit 9c618d8b21
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
polymorphic/tests/test_orm.py
View File

@ -360,11 +360,7 @@ class PolymorphicTests(TestCase):
# no pretty printing # no pretty printing
ModelShow1_plain.objects.create(field1='abc') ModelShow1_plain.objects.create(field1='abc')
ModelShow2_plain.objects.create(field1='abc', field2='def') ModelShow2_plain.objects.create(field1='abc', field2='def')
# repr classnames are not hardcoded in Django 1.11+
if django.VERSION >= (1, 11):
self.assertEqual(qrepr(ModelShow1_plain.objects.all()), '<PolymorphicQuerySet [<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]>') self.assertEqual(qrepr(ModelShow1_plain.objects.all()), '<PolymorphicQuerySet [<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]>')
else:
self.assertEqual(qrepr(ModelShow1_plain.objects.all()), '<QuerySet [<ModelShow1_plain: ModelShow1_plain object>, <ModelShow2_plain: ModelShow2_plain object>]>')
def test_extra_method(self): def test_extra_method(self):
self.create_model2abcd() self.create_model2abcd()
@ -813,9 +809,13 @@ def qrepr(data):
Ensure consistent repr() output for the QuerySet object. Ensure consistent repr() output for the QuerySet object.
""" """
if isinstance(data, QuerySet): if isinstance(data, QuerySet):
if django.VERSION >= (1, 10): if django.VERSION >= (1, 11):
return repr(data) return repr(data)
elif django.VERSION >= (1, 10):
# Django 1.11 still shows "<QuerySet [", not taking the actual type into account.
return '<{} {}'.format(data.__class__.__name__, repr(data)[10:])
else: else:
return '<QuerySet %r>' % data # Simulate Django 1.11 behavior for older Django versions.
return '<{} {}>'.format(data.__class__.__name__, repr(data))
return repr(data) return repr(data)