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

Use assertRegex to ignore object IDs 

Sometimes the tests failed because these objects had IDs that differed
from expectations. As the IDs are not relevant to this test, I have
replaced the exact string match with a regex match that accepts any ID.
fix_request_path_info
Charlie Denton 2018-01-17 22:01:02 +00:00
parent c3179058d3
commit ed40b9e3e2
No known key found for this signature in database
GPG Key ID: 5BBA1783DA191613
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
polymorphic/tests/test_orm.py
View File

@ -228,14 +228,14 @@ class PolymorphicTests(TransactionTestCase):
objects_deferred = Model2A.objects.defer('field1') objects_deferred = Model2A.objects.defer('field1')
self.assertNotIn('field1', objects_deferred[0].__dict__, 'field1 was not deferred (using defer())') self.assertNotIn('field1', objects_deferred[0].__dict__, 'field1 was not deferred (using defer())')
self.assertEqual(repr(objects_deferred[0]), self.assertRegex(repr(objects_deferred[0]),
'<Model2A: id 1, field1 (CharField), deferred[field1]>') '<Model2A: id \d+, field1 \(CharField\), deferred\[field1\]>')
self.assertEqual(repr(objects_deferred[1]), self.assertRegex(repr(objects_deferred[1]),
'<Model2B: id 2, field1 (CharField), field2 (CharField), deferred[field1]>') '<Model2B: id \d+, field1 \(CharField\), field2 \(CharField\), deferred\[field1\]>')
self.assertEqual(repr(objects_deferred[2]), self.assertRegex(repr(objects_deferred[2]),
'<Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField), deferred[field1]>') '<Model2C: id \d+, field1 \(CharField\), field2 \(CharField\), field3 \(CharField\), deferred\[field1\]>')
self.assertEqual(repr(objects_deferred[3]), self.assertRegex(repr(objects_deferred[3]),
'<Model2D: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField), deferred[field1]>') '<Model2D: id \d+, field1 \(CharField\), field2 \(CharField\), field3 \(CharField\), field4 \(CharField\), deferred\[field1\]>')
objects_only = Model2A.objects.only('pk', 'polymorphic_ctype', 'field1') objects_only = Model2A.objects.only('pk', 'polymorphic_ctype', 'field1')
@ -246,33 +246,33 @@ class PolymorphicTests(TransactionTestCase):
' on a child model') ' on a child model')
self.assertNotIn('field4', objects_only[3].__dict__, self.assertNotIn('field4', objects_only[3].__dict__,
'field4 was not deferred (using only())') 'field4 was not deferred (using only())')
self.assertEqual(repr(objects_only[0]), self.assertRegex(repr(objects_only[0]),
'<Model2A: id 1, field1 (CharField)>') '<Model2A: id \d+, field1 \(CharField\)>')
self.assertEqual(repr(objects_only[1]), self.assertRegex(repr(objects_only[1]),
'<Model2B: id 2, field1 (CharField), field2 (CharField), deferred[field2]>') '<Model2B: id \d+, field1 \(CharField\), field2 \(CharField\), deferred\[field2\]>')
self.assertEqual(repr(objects_only[2]), self.assertRegex(repr(objects_only[2]),
'<Model2C: id 3, field1 (CharField), field2 (CharField), field3 (CharField), ' '<Model2C: id \d+, field1 \(CharField\), field2 \(CharField\), field3 \(CharField\), '
'deferred[field2,field3,model2a_ptr_id]>') 'deferred\[field2,field3,model2a_ptr_id\]>')
self.assertEqual(repr(objects_only[3]), self.assertRegex(repr(objects_only[3]),
'<Model2D: id 4, field1 (CharField), field2 (CharField), field3 (CharField), field4 (CharField), ' '<Model2D: id \d+, field1 \(CharField\), field2 \(CharField\), field3 \(CharField\), field4 \(CharField\), '
'deferred[field2,field3,field4,model2a_ptr_id,model2b_ptr_id]>') 'deferred\[field2,field3,field4,model2a_ptr_id,model2b_ptr_id\]>')
ModelX.objects.create(field_b="A1", field_x="A2") ModelX.objects.create(field_b="A1", field_x="A2")
ModelY.objects.create(field_b="B1", field_y="B2") ModelY.objects.create(field_b="B1", field_y="B2")
objects_deferred = Base.objects.defer('ModelY___field_y') objects_deferred = Base.objects.defer('ModelY___field_y')
self.assertEqual(repr(objects_deferred[0]), self.assertRegex(repr(objects_deferred[0]),
'<ModelX: id 3, field_b (CharField), field_x (CharField)>') '<ModelX: id \d+, field_b \(CharField\), field_x \(CharField\)>')
self.assertEqual(repr(objects_deferred[1]), self.assertRegex(repr(objects_deferred[1]),
'<ModelY: id 4, field_b (CharField), field_y (CharField), deferred[field_y]>') '<ModelY: id \d+, field_b \(CharField\), field_y \(CharField\), deferred\[field_y\]>')
objects_only = Base.objects.only( objects_only = Base.objects.only(
'polymorphic_ctype', 'ModelY___field_y', 'ModelX___field_x', 'polymorphic_ctype', 'ModelY___field_y', 'ModelX___field_x',
) )
self.assertEqual(repr(objects_only[0]), self.assertRegex(repr(objects_only[0]),
'<ModelX: id 3, field_b (CharField), field_x (CharField), deferred[field_b]>') '<ModelX: id \d+, field_b \(CharField\), field_x \(CharField\), deferred\[field_b\]>')
self.assertEqual(repr(objects_only[1]), self.assertRegex(repr(objects_only[1]),
'<ModelY: id 4, field_b (CharField), field_y (CharField), deferred[field_b]>') '<ModelY: id \d+, field_b \(CharField\), field_y \(CharField\), deferred\[field_b\]>')
def test_defer_related_fields(self): def test_defer_related_fields(self):
self.create_model2abcd() self.create_model2abcd()