diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-06-09 12:05:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
| commit | cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9 (patch) | |
| tree | d59806d5799ac74b9134183fba5a0ecf8b762d65 /ishtar_common/tests.py | |
| parent | 8d908f14a8cd15734a522c17c144efe06e21416a (diff) | |
| download | Ishtar-cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9.tar.bz2 Ishtar-cbe8d22ccecad9e09dd70f5fdbbd78bf497671a9.zip | |
Fix container merge
Diffstat (limited to 'ishtar_common/tests.py')
| -rw-r--r-- | ishtar_common/tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
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, |