🩹Adapted pytest benchmarks to new monkeypatch_plugin_registry

🩹Use the new monkeypatch_plugin_registry contextmanager in the pytest benchamrks to setup_model 🐛 Make removal of (optional) key fault tolerant
glotaran · Sep 15, 2021 · e057dd9 · e057dd9
1 parent c18f791
commit e057dd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/benchmark/pytest/analysis/test_problem.py b/benchmark/pytest/analysis/test_problem.py
@@ -13,6 +13,7 @@
 from glotaran.model import megacomplex
 from glotaran.parameter import ParameterGroup
 from glotaran.project import Scheme
+from glotaran.testing.plugin_system import monkeypatch_plugin_registry
 
 if TYPE_CHECKING:
     from glotaran.model import DatasetModel
@@ -53,6 +54,7 @@ def finalize_data(
         pass
 
 
+@monkeypatch_plugin_registry(test_megacomplex={"benchmark": BenchmarkMegacomplex})
 def setup_model(index_dependent):
     model_dict = {
         "megacomplex": {"m1": {"is_index_dependent": index_dependent}},

diff --git a/glotaran/model/model.py b/glotaran/model/model.py
@@ -85,7 +85,7 @@ def from_dict(
             }
         if default_megacomplex_type is not None:
             megacomplex_types[default_megacomplex_type] = get_megacomplex(default_megacomplex_type)
-            del model_dict["default-megacomplex"]
+            model_dict.pop("default-megacomplex", None)
 
         model = cls(
             megacomplex_types=megacomplex_types, default_megacomplex_type=default_megacomplex_type