Fix memory values

Author: juanjosegarcan

tests/conftest.py

@@ -1,7 +1,8 @@
 import json
 import pytest
-from pathlib import Path
 import platform
+from pathlib import Path
+
 from neurodamus.core._utils import run_only_rank0
 
 try:
@@ -91,18 +92,16 @@ def change_test_dir(monkeypatch, tmp_path):
 
 @pytest.fixture()
 def copy_memory_files(change_test_dir):
-    import json
-
+    # Fix values to ensure allocation memory (0,0)[1, 3] (1,0)[2]
     metypes_memory = {
-        "MTYPE0-ETYPE0": 1377.9,
-        "MTYPE1-ETYPE1": 1107.8,
-        "MTYPE2-ETYPE2": 97.9,
-        "MTYPE0-ETYPE1": 83.8
+        "MTYPE0-ETYPE0": 100.0,
+        "MTYPE1-ETYPE1": 200.0,
+        "MTYPE2-ETYPE2": 1000.0,
     }
-    with Path("cell_memory_usage.json").open("w") as f:
-        json.dump(metypes_memory, f, indent=4)
     with Path("memory_per_metype.json").open("w") as f:
         json.dump(metypes_memory, f, indent=4)
+    with Path("cell_memory_usage.json").open("w") as f:
+        json.dump(metypes_memory, f, indent=4)
 
 
 @run_only_rank0

tests/unit-mpi/test_dry_run.py

@@ -129,6 +129,7 @@ def test_dry_run_dynamic_distribute(create_tmp_simulation_config_file, mpi_ranks
     # RingA neuron 1 always in rank 0, neuron 2 always in rank 1
     # but neuron 3 can be in  either of the two
     if rank == 0:
-        assert is_subset(rank_allocation_standard['RingA'][(0, 0)], [1, 3])
+        expected_allocation = {'RingA': {(0, 0): [1, 3]}}
     elif rank == 1:
-        assert is_subset(rank_allocation_standard['RingA'][(1, 0)], [2, 3])
+        expected_allocation = {'RingA': {(1, 0): [2]}}
+    assert rank_allocation_standard == expected_allocation

tests/unit/test_dry_run.py

@@ -100,8 +100,8 @@ def test_dry_run_lb_mode_memory(create_tmp_simulation_config_file, copy_memory_f
     rank_allocation_standard = defaultdict_to_standard_types(rank_alloc)
     expected_allocation = {
         'RingA': {
-            (0, 0): [1],
-            (1, 0): [2, 3]
+            (0, 0): [1, 3],
+            (1, 0): [2]
         }
     }
     assert rank_allocation_standard == expected_allocation