glob files in examples dir

Author: cadenmyers13

tests/conftest.py

@@ -40,5 +40,6 @@ def load_module_from_path(path: Path):
 def run_cmi_script(script_path: Path):
     """General runner for example scripts with a main()."""
     module = load_module_from_path(script_path)
-    assert hasattr(module, "main"), f"{script_path} has no main() function"
+    if not hasattr(module, "main"):
+        pytest.skip(f"{script_path} has no main() function")
     module.main()

tests/test_ch03.py

@@ -3,16 +3,13 @@
 import pytest
 from conftest import __examples_dir__, run_cmi_script
 
+chapter = "ch03NiModelling"
+chapter_dir = Path(__examples_dir__) / chapter
+example_scripts = list(chapter_dir.rglob("*.py"))
 
-@pytest.mark.parametrize(
-    "relative_path",
-    [
-        f"{__examples_dir__}/ch03NiModelling"
-        + "/solutions/diffpy-cmi/fitBulkNi.py",
-        f"{__examples_dir__}/ch03NiModelling"
-        + "/solutions/diffpy-cmi/fitNPPt.py",
-    ],
-)
-def test_ch03_examples(relative_path):
-    script_path = Path(__file__).parent.parent / relative_path
+
+# Runs all example scripts in chapter 3, skips files in main() is not defined.
+# Passes if script runs without error.
+@pytest.mark.parametrize("script_path", example_scripts, ids=lambda p: p.name)
+def test_ch03_examples(script_path):
     run_cmi_script(script_path)

tests/test_ch05.py

@@ -3,13 +3,13 @@
 import pytest
 from conftest import __examples_dir__, run_cmi_script
 
+chapter = "ch05Fit2Phase"
+chapter_dir = Path(__examples_dir__) / chapter
+example_scripts = list(chapter_dir.rglob("*.py"))
 
-@pytest.mark.parametrize(
-    "relative_path",
-    [
-        f"{__examples_dir__}/ch05Fit2Phase/solutions/diffpy-cmi/fit2P.py",
-    ],
-)
-def test_ch05_examples(relative_path):
-    script_path = Path(__file__).parent.parent / relative_path
+
+# Runs all example scripts in chapter 5, skips files in main() is not defined.
+# Passes if script runs without error.
+@pytest.mark.parametrize("script_path", example_scripts, ids=lambda p: p.name)
+def test_ch03_examples(script_path):
     run_cmi_script(script_path)

tests/test_ch06.py

@@ -3,14 +3,13 @@
 import pytest
 from conftest import __examples_dir__, run_cmi_script
 
+chapter = "ch06RefineCrystalStructureGen"
+chapter_dir = Path(__examples_dir__) / chapter
+example_scripts = list(chapter_dir.rglob("*.py"))
 
-@pytest.mark.parametrize(
-    "relative_path",
-    [
-        f"{__examples_dir__}/ch06RefineCrystalStructureGen"
-        + "/solutions/diffpy-cmi/fitCrystalGen.py",
-    ],
-)
-def test_ch06_examples(relative_path):
-    script_path = Path(__file__).parent.parent / relative_path
+
+# Runs all example scripts in chapter 6, skips files in main() is not defined.
+# Passes if script runs without error.
+@pytest.mark.parametrize("script_path", example_scripts, ids=lambda p: p.name)
+def test_ch03_examples(script_path):
     run_cmi_script(script_path)

tests/test_ch07.py

@@ -3,14 +3,13 @@
 import pytest
 from conftest import __examples_dir__, run_cmi_script
 
+chapter = "ch07StructuralPhaseTransitions"
+chapter_dir = Path(__examples_dir__) / chapter
+example_scripts = list(chapter_dir.rglob("*.py"))
 
-@pytest.mark.parametrize(
-    "relative_path",
-    [
-        f"{__examples_dir__}/ch07StructuralPhaseTransitions"
-        + "/solutions/diffpy-cmi/fitTSeries.py",
-    ],
-)
-def test_ch07_examples(relative_path):
-    script_path = Path(__file__).parent.parent / relative_path
+
+# Runs all example scripts in chapter 7, skips files in main() is not defined.
+# Passes if script runs without error.
+@pytest.mark.parametrize("script_path", example_scripts, ids=lambda p: p.name)
+def test_ch03_examples(script_path):
     run_cmi_script(script_path)

tests/test_ch08.py

@@ -3,14 +3,13 @@
 import pytest
 from conftest import __examples_dir__, run_cmi_script
 
+chapter = "ch08NPRefinement"
+chapter_dir = Path(__examples_dir__) / chapter
+example_scripts = list(chapter_dir.rglob("*.py"))
 
-@pytest.mark.parametrize(
-    "relative_path",
-    [
-        f"{__examples_dir__}/ch08NPRefinement"
-        + "/solutions/diffpy-cmi/fitCdSeNP.py",
-    ],
-)
-def test_ch08_examples(relative_path):
-    script_path = Path(__file__).parent.parent / relative_path
+
+# Runs all example scripts in chapter 8, skips files in main() is not defined.
+# Passes if script runs without error.
+@pytest.mark.parametrize("script_path", example_scripts, ids=lambda p: p.name)
+def test_ch03_examples(script_path):
     run_cmi_script(script_path)

tests/test_ch11.py

@@ -3,13 +3,13 @@
 import pytest
 from conftest import __examples_dir__, run_cmi_script
 
+chapter = "ch11ClusterXYZ"
+chapter_dir = Path(__examples_dir__) / chapter
+example_scripts = list(chapter_dir.rglob("*.py"))
 
-@pytest.mark.parametrize(
-    "relative_path",
-    [
-        f"{__examples_dir__}/ch11ClusterXYZ/solutions/diffpy-cmi/fitCdSeNP.py",
-    ],
-)
-def test_ch11_examples(relative_path):
-    script_path = Path(__file__).parent.parent / relative_path
+
+# Runs all example scripts in chapter 11, skips files in main() is not defined.
+# Passes if script runs without error.
+@pytest.mark.parametrize("script_path", example_scripts, ids=lambda p: p.name)
+def test_ch03_examples(script_path):
     run_cmi_script(script_path)