Serializations: operations, sites, parcels

1 files changed, 22 insertions, 20 deletions

diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py
index 99840ddaa..7bb3ce098 100644
--- a/ishtar_common/tests.py
+++ b/ishtar_common/tests.py
@@ -598,9 +598,7 @@ class CacheTest(TestCase):
         self.assertIn(b'href="/operation_modification/', response.content)
 
 
-class SerializationTest(TestCase):
-    fixtures = COMMON_FIXTURES + WAREHOUSE_FIXTURES
-
+class GenericSerializationTest:
     def generic_serialization_test(self, serialize):
         json_result = serialize()
         for key in json_result.keys():
@@ -618,6 +616,27 @@ class SerializationTest(TestCase):
                     "expected".format(module.__name__, model_name,
                                       serialization_count, current_count))
 
+    def generic_restore_test_genzip(self, model_list, serialization):
+        current_number = {}
+        for model in model_list:
+            current_number[model.__name__] = model.objects.count()
+        zip_filename = serialization(archive=True)
+        return current_number, zip_filename
+
+    def generic_restore_test(self, zip_filename, current_number, model_list):
+        restore_serialized(zip_filename, delete_existing=True)
+        for model in model_list:
+            previous_nb = current_number[model.__name__]
+            current_nb = model.objects.count()
+            self.assertEqual(
+                previous_nb, current_nb,
+                msg="Restore for model {} failed. Initial: {}, restored: "
+                    "{}.".format(model.__name__, previous_nb, current_nb))
+
+
+class SerializationTest(GenericSerializationTest, TestCase):
+    fixtures = COMMON_FIXTURES + WAREHOUSE_FIXTURES
+
     def test_type_serialization(self):
         self.generic_serialization_test(type_serialization)
 
@@ -758,23 +777,6 @@ class SerializationTest(TestCase):
         self.assertTrue(OperationRT.objects.filter(
             inverse_relation__isnull=False).count())
 
-    def generic_restore_test_genzip(self, model_list, serialization):
-        current_number = {}
-        for model in model_list:
-            current_number[model.__name__] = model.objects.count()
-        zip_filename = serialization(archive=True)
-        return current_number, zip_filename
-
-    def generic_restore_test(self, zip_filename, current_number, model_list):
-        restore_serialized(zip_filename, delete_existing=True)
-        for model in model_list:
-            previous_nb = current_number[model.__name__]
-            current_nb = model.objects.count()
-            self.assertEqual(
-                previous_nb, current_nb,
-                msg="Restore for model {} failed. Initial: {}, restored: "
-                    "{}.".format(model.__name__, previous_nb, current_nb))
-
     def test_conf_restore(self):
         values = self.create_default_conf()
         current_number, zip_filename = self.generic_restore_test_genzip(