Cleans up tests and refines pytest configuration

AndrewSazonov · AndrewSazonov · commit 2b6e373a3635 · 2025-10-16T09:14:41.000+02:00
diff --git a/pytest.ini b/pytest.ini
@@ -1,3 +1,8 @@
 [pytest]
 markers =
     fast: mark test as fast (should be run on every push)
+    functional: mark test as functional (slow/integration; opt-in)
+addopts = --import-mode=importlib
+filterwarnings =
+    ignore::DeprecationWarning:cryspy\.
+    ignore:.*scipy\.misc is deprecated.*:DeprecationWarning
diff --git a/tests/unit/easydiffraction/analysis/fit_helpers/test_reporting.py b/tests/unit/easydiffraction/analysis/fit_helpers/test_reporting.py
@@ -2,16 +2,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-def _assert_equal(expected, actual):
-    assert expected == actual
-
-
 def test_module_import():
     import easydiffraction.analysis.fit_helpers.reporting as MUT
 
     expected_module_name = 'easydiffraction.analysis.fit_helpers.reporting'
     actual_module_name = MUT.__name__
-    _assert_equal(expected_module_name, actual_module_name)
+    assert expected_module_name == actual_module_name
 
 
 def test_fitresults_display_results_prints_and_table(capsys, monkeypatch):
diff --git a/tests/unit/easydiffraction/analysis/fit_helpers/test_tracking.py b/tests/unit/easydiffraction/analysis/fit_helpers/test_tracking.py
@@ -3,22 +3,13 @@
 
 import numpy as np
 
-# expected vs actual helpers
-
-
-def _assert_equal(expected, actual):
-    assert expected == actual
-
-
-# Module under test: easydiffraction.analysis.fit_helpers.tracking
-
 
 def test_module_import():
     import easydiffraction.analysis.fit_helpers.tracking as MUT
 
     expected_module_name = 'easydiffraction.analysis.fit_helpers.tracking'
     actual_module_name = MUT.__name__
-    _assert_equal(expected_module_name, actual_module_name)
+    assert expected_module_name == actual_module_name
 
 
 def test_tracker_terminal_flow_prints_and_updates_best(monkeypatch, capsys):
diff --git a/tests/unit/easydiffraction/analysis/test_calculation.py b/tests/unit/easydiffraction/analysis/test_calculation.py
@@ -2,22 +2,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# expected vs actual helpers
-
-
-def _assert_equal(expected, actual):
-    assert expected == actual
-
-
-# Module under test: easydiffraction.analysis.calculation
-
-
 def test_module_import():
     import easydiffraction.analysis.calculation as MUT
 
     expected_module_name = 'easydiffraction.analysis.calculation'
     actual_module_name = MUT.__name__
-    _assert_equal(expected_module_name, actual_module_name)
+    assert expected_module_name == actual_module_name
 
 
 def test_calculator_wrapper_set_and_calls(monkeypatch):
diff --git a/tests/unit/easydiffraction/analysis/test_fitting.py b/tests/unit/easydiffraction/analysis/test_fitting.py
@@ -2,22 +2,13 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# expected vs actual helpers
-
-
-def _assert_equal(expected, actual):
-    assert expected == actual
-
-
-# Module under test: easydiffraction.analysis.fitting
-
 
 def test_module_import():
     import easydiffraction.analysis.fitting as MUT
 
     expected_module_name = 'easydiffraction.analysis.fitting'
     actual_module_name = MUT.__name__
-    _assert_equal(expected_module_name, actual_module_name)
+    assert expected_module_name == actual_module_name
 
 
 def test_fitter_early_exit_when_no_params(capsys, monkeypatch):
diff --git a/tests/unit/easydiffraction/core/__init__.py b/tests/unit/easydiffraction/core/__init__.py
diff --git a/tests/unit/easydiffraction/core/test_factory.py b/tests/unit/easydiffraction/core/test_factory.py
@@ -3,8 +3,6 @@
 
 import pytest
 
-# Module under test: easydiffraction.core.factory
-
 
 def test_module_import():
     import easydiffraction.core.factory as MUT
diff --git a/tests/unit/easydiffraction/core/test_validation.py b/tests/unit/easydiffraction/core/test_validation.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.core.validation
-
-
 def test_module_import():
     import easydiffraction.core.validation as MUT
 
diff --git a/tests/unit/easydiffraction/crystallography/test_crystallography.py b/tests/unit/easydiffraction/crystallography/test_crystallography.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.crystallography.crystallography
-
-
 def test_module_import():
     import easydiffraction.crystallography.crystallography as MUT
 
diff --git a/tests/unit/easydiffraction/crystallography/test_space_groups.py b/tests/unit/easydiffraction/crystallography/test_space_groups.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.crystallography.space_groups
-
-
 def test_module_import():
     import easydiffraction.crystallography.space_groups as MUT
 
diff --git a/tests/unit/easydiffraction/experiments/__init__.py b/tests/unit/easydiffraction/experiments/__init__.py
diff --git a/tests/unit/easydiffraction/experiments/categories/test_experiment_type.py b/tests/unit/easydiffraction/experiments/categories/test_experiment_type.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.experiments.categories.experiment_type
-
-
 def test_module_import():
     import easydiffraction.experiments.categories.experiment_type as MUT
 
diff --git a/tests/unit/easydiffraction/experiments/datastore/__init__.py b/tests/unit/easydiffraction/experiments/datastore/__init__.py
diff --git a/tests/unit/easydiffraction/experiments/datastore/test_base.py b/tests/unit/easydiffraction/experiments/datastore/test_base.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.experiments.datastore.base
-
-
 def test_module_import():
     import easydiffraction.experiments.datastore.base as MUT
 
diff --git a/tests/unit/easydiffraction/experiments/datastore/test_pd.py b/tests/unit/easydiffraction/experiments/datastore/test_pd.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.experiments.datastore.pd
-
-
 def test_module_import():
     import easydiffraction.experiments.datastore.pd as MUT
 
diff --git a/tests/unit/easydiffraction/experiments/datastore/test_sc.py b/tests/unit/easydiffraction/experiments/datastore/test_sc.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.experiments.datastore.sc
-
-
 def test_module_import():
     import easydiffraction.experiments.datastore.sc as MUT
 
diff --git a/tests/unit/easydiffraction/experiments/test_experiments.py b/tests/unit/easydiffraction/experiments/test_experiments.py
@@ -2,22 +2,12 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# expected vs actual helpers
-
-
-def _assert_equal(expected, actual):
-    assert expected == actual
-
-
-# Module under test: easydiffraction.experiments.experiments
-
-
 def test_module_import():
     import easydiffraction.experiments.experiments as MUT
 
     expected_module_name = 'easydiffraction.experiments.experiments'
     actual_module_name = MUT.__name__
-    _assert_equal(expected_module_name, actual_module_name)
+    assert expected_module_name == actual_module_name
 
 
 def test_experiments_show_and_remove(monkeypatch, capsys):
diff --git a/tests/unit/easydiffraction/io/cif/test_serialize.py b/tests/unit/easydiffraction/io/cif/test_serialize.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.io.cif.serialize
-
-
 def test_module_import():
     import easydiffraction.io.cif.serialize as MUT
 
diff --git a/tests/unit/easydiffraction/plotting/plotters/test_plotter_ascii.py b/tests/unit/easydiffraction/plotting/plotters/test_plotter_ascii.py
@@ -3,8 +3,6 @@
 
 import numpy as np
 
-# Module under test: easydiffraction.plotting.plotters.plotter_ascii
-
 
 def test_module_import():
     import easydiffraction.plotting.plotters.plotter_ascii as MUT
diff --git a/tests/unit/easydiffraction/plotting/plotters/test_plotter_base.py b/tests/unit/easydiffraction/plotting/plotters/test_plotter_base.py
@@ -3,8 +3,6 @@
 
 import importlib
 
-# Module under test: easydiffraction.plotting.plotters.plotter_base
-
 
 def test_module_import():
     import easydiffraction.plotting.plotters.plotter_base as MUT
diff --git a/tests/unit/easydiffraction/plotting/test_plotting.py b/tests/unit/easydiffraction/plotting/test_plotting.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.plotting.plotting
-
-
 def test_module_import():
     import easydiffraction.plotting.plotting as MUT
 
diff --git a/tests/unit/easydiffraction/project/test_project.py b/tests/unit/easydiffraction/project/test_project.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.project.project
-
-
 def test_module_import():
     import easydiffraction.project.project as MUT
 
diff --git a/tests/unit/easydiffraction/project/test_project_info.py b/tests/unit/easydiffraction/project/test_project_info.py
@@ -2,9 +2,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 
-# Module under test: easydiffraction.project.project_info
-
-
 def test_module_import():
     import easydiffraction.project.project_info as MUT
 
diff --git a/tests/unit/easydiffraction/sample_models/__init__.py b/tests/unit/easydiffraction/sample_models/__init__.py
diff --git a/tests/unit/easydiffraction/sample_models/categories/__init__.py b/tests/unit/easydiffraction/sample_models/categories/__init__.py
diff --git a/tests/unit/easydiffraction/sample_models/sample_model/__init__.py b/tests/unit/easydiffraction/sample_models/sample_model/__init__.py
diff --git a/tests/unit/easydiffraction/test___main__.py b/tests/unit/easydiffraction/test___main__.py
@@ -6,9 +6,6 @@
 runner = CliRunner()
 
 
-# Module under test: easydiffraction.__main__
-
-
 def test_module_import():
     import easydiffraction.__main__ as MUT
 
diff --git a/tools/test_scripts.py b/tools/test_scripts.py
@@ -11,7 +11,12 @@
 
 import pytest
 
-TUTORIALS = list(Path('tutorials').rglob('*.py'))
+# Mark this module as 'functional' so it's excluded by default
+# (see pytest.ini)
+pytestmark = pytest.mark.functional
+
+# Discover tutorial scripts, excluding temporary checkpoint files
+TUTORIALS = [p for p in Path('tutorials').rglob('*.py') if '.ipynb_checkpoints' not in p.parts]
 
 
 @pytest.mark.parametrize('script_path', TUTORIALS)
