Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import pytest


def _cleanup_pysb_exports():
"""Remove all symbols exported by :class:`pysb.SelfExporter`.

:meth:`pysb.SelfExporter.cleanup` does not remove a model that was
exported under an explicit name, so remove that one first.
Fails if any other exported PySB symbols remain in the target namespace.
"""
import pysb

exporter = pysb.SelfExporter
namespace = exporter.target_globals
module = exporter.target_module
model = exporter.default_model
if model is not None and namespace.get(model.name) is model:
del namespace[model.name]
exporter.cleanup()

if namespace is None:
return

# objects bound under their own name were exported by `SelfExporter`
leaked = [
name
for name, value in namespace.items()
if isinstance(value, pysb.Model | pysb.Component)
and value.name == name
]
for name in leaked:
del namespace[name]
assert not leaked, f"Leaked PySB symbols in {module}: {leaked}"


@pytest.fixture
def clean_pysb_exports():
"""Clean up PySB auto-exported symbols before and after the test.

Yields the cleanup function for use within the test, e.g., before
defining another model.
"""
_cleanup_pysb_exports()
yield _cleanup_pysb_exports
_cleanup_pysb_exports()
15 changes: 3 additions & 12 deletions tests/v1/test_model_pysb.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
"""Test related to petab.models.model_pysb"""

import pysb
import pytest

from petab.v1.models.pysb_model import (
PySBModel,
Expand All @@ -10,14 +9,6 @@
)


@pytest.fixture(scope="function")
def uses_pysb():
"""Cleanup PySB auto-exported symbols before and after test"""
pysb.SelfExporter.cleanup()
yield ()
pysb.SelfExporter.cleanup()


def test_parse_species_name():
assert parse_species_name("cyclin(Y='U', b=None)") == [
("cyclin", None, {"Y": "U", "b": None})
Expand Down Expand Up @@ -49,7 +40,7 @@ def test_parse_species_name():
# TODO: MultiState


def test_pysb_model(uses_pysb):
def test_pysb_model(clean_pysb_exports):
model = pysb.Model()
pysb.Compartment("c1")
pysb.Monomer("A")
Expand All @@ -75,7 +66,7 @@ def test_pysb_model(uses_pysb):
assert petab_model.is_state_variable("A(s='a')") is False


def test_pattern_parsing(uses_pysb):
def test_pattern_parsing(clean_pysb_exports):
model = pysb.Model()
c1 = pysb.Compartment("c1")
A = pysb.Monomer("A")
Expand All @@ -90,7 +81,7 @@ def test_pattern_parsing(uses_pysb):
assert str(pattern) == str(pattern_from_string("B(s='a') ** c1", model))


def test_pysb_model_repr(uses_pysb):
def test_pysb_model_repr(clean_pysb_exports):
model = pysb.Model(name="test")
petab_model = PySBModel(model)
assert repr(petab_model) == "<PySBModel 'test'>"
13 changes: 2 additions & 11 deletions tests/v2/test_lint.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,13 @@
from copy import deepcopy

import pysb
import pytest

from petab.v2 import Problem
from petab.v2.lint import *
from petab.v2.models.pysb_model import PySBModel
from petab.v2.models.sbml_model import SbmlModel


@pytest.fixture
def uses_pysb():
"""Cleanup PySB auto-exported symbols before and after test"""
pysb.SelfExporter.cleanup()
yield ()
pysb.SelfExporter.cleanup()


def test_check_experiments():
"""Test ``CheckExperimentTable``."""
problem = Problem()
Expand Down Expand Up @@ -121,7 +112,7 @@ def test_validate_initial_change_symbols():
assert "contains additional symbols: {'p2'}" in error.message


def test_check_mapping_table(uses_pysb):
def test_check_mapping_table(clean_pysb_exports):
"""Test checks related to the mapping table."""
problem = Problem()

Expand Down Expand Up @@ -155,7 +146,7 @@ def test_check_mapping_table(uses_pysb):
assert check.run(problem) is None

# Invalid: petabEntityId is referenced in the model
pysb.SelfExporter.cleanup()
clean_pysb_exports()
pysb_model_invalid = pysb.Model("test_model_invalid")
pysb.Monomer("A_")
pysb.Initial(A_() ** pysb.Compartment("C"), pysb.Parameter("A", 1))
Expand Down
Loading