From 8fa5846e513247ba90ce95a31587e3592e8aab30 Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 17:46:55 +0600 Subject: [PATCH 1/2] conerted multi-table-inheritence test asserts to pytest --- tests/test_multitable_inheritance.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index 611333aa8..a63e07fac 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -44,8 +44,7 @@ class InheritedModelSerializationTests(TestCase): """ child = ChildModel(name1='parent name', name2='child name') serializer = DerivedModelSerializer(child) - self.assertEqual(set(serializer.data.keys()), - set(['name1', 'name2', 'id'])) + assert set(serializer.data.keys()) == set(['name1', 'name2', 'id']) def test_onetoone_primary_key_model_fields_as_expected(self): """ @@ -55,8 +54,7 @@ class InheritedModelSerializationTests(TestCase): parent = ParentModel.objects.create(name1='parent name') associate = AssociatedModel.objects.create(name='hello', ref=parent) serializer = AssociatedModelSerializer(associate) - self.assertEqual(set(serializer.data.keys()), - set(['name', 'ref'])) + assert set(serializer.data.keys()) == set(['name', 'ref']) def test_data_is_valid_without_parent_ptr(self): """ @@ -68,4 +66,5 @@ class InheritedModelSerializationTests(TestCase): 'name2': 'child name', } serializer = DerivedModelSerializer(data=data) - self.assertEqual(serializer.is_valid(), True) + assert serializer.is_valid() is True + From 43677b8baf279367bbf27a1544c7423cc2db9dee Mon Sep 17 00:00:00 2001 From: Asif Saifuddin Auvi Date: Wed, 4 Jan 2017 17:54:14 +0600 Subject: [PATCH 2/2] flake8 fix --- tests/test_multitable_inheritance.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_multitable_inheritance.py b/tests/test_multitable_inheritance.py index a63e07fac..2aacbc348 100644 --- a/tests/test_multitable_inheritance.py +++ b/tests/test_multitable_inheritance.py @@ -67,4 +67,3 @@ class InheritedModelSerializationTests(TestCase): } serializer = DerivedModelSerializer(data=data) assert serializer.is_valid() is True -