From 3c950402b984badbbd9bad5b4616342760f4fd90 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 9 Jun 2020 12:05:37 +0200 Subject: Fix container merge --- ishtar_common/tests.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ishtar_common/tests.py') diff --git a/ishtar_common/tests.py b/ishtar_common/tests.py index 122f29d92..6d112f2d1 100644 --- a/ishtar_common/tests.py +++ b/ishtar_common/tests.py @@ -682,6 +682,8 @@ class GenericSerializationTest: module = importlib.import_module(module_name + ".models") model = getattr(module, model_name) + if getattr(model, "TO_BE_DELETED", False): + continue current_count = model.objects.count() result = json.loads(json_result[key]) serialization_count = len(result) @@ -917,11 +919,11 @@ class SerializationTest(GenericSerializationTest, TestCase): ) wl1 = WarehouseDivisionLink.objects.create( warehouse=w1, - division=wd1 + container_type=ContainerType.objects.all()[0], ) wl2 = WarehouseDivisionLink.objects.create( warehouse=w2, - division=wd2 + container_type = ContainerType.objects.all()[1], ) ContainerLocalisation.objects.create( container=c1, -- cgit v1.2.3