Use runpy instead of exec for script tests

markcampanelli · Feb 12, 2024 · 5beb491 · 5beb491
1 parent aa8492c
commit 5beb491
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/pvfit/measurement/spectral_correction/demos/getting_started_test.py b/pvfit/measurement/spectral_correction/demos/getting_started_test.py
@@ -4,13 +4,10 @@
 Copyright 2023 Intelligent Measurement Systems LLC
 """
 
-import importlib.resources
+import os
+import runpy
 
 
-def test_getting_started():
+def test_getting_started_script():
     """Test that getting started script runs without error."""
-    exec(
-        importlib.resources.files("pvfit.measurement.spectral_correction.demos")
-        .joinpath("getting_started.py")
-        .read_text()
-    )
+    runpy.run_path(os.path.abspath(__file__).replace("_test.py", ".py"))
diff --git a/pvfit/modeling/dc/single_diode/equation/demos/getting_started_test.py b/pvfit/modeling/dc/single_diode/equation/demos/getting_started_test.py
@@ -4,13 +4,10 @@
 Copyright 2023 Intelligent Measurement Systems LLC
 """
 
-import importlib.resources
+import os
+import runpy
 
 
-def test_getting_started_equation():
+def test_getting_started_script():
     """Test that getting started script runs without error."""
-    exec(
-        importlib.resources.files("pvfit.modeling.dc.single_diode.equation.demos")
-        .joinpath("getting_started.py")
-        .read_text()
-    )
+    runpy.run_path(os.path.abspath(__file__).replace("_test.py", ".py"))
diff --git a/pvfit/modeling/dc/single_diode/model/demos/getting_started_test.py b/pvfit/modeling/dc/single_diode/model/demos/getting_started_test.py
@@ -4,13 +4,10 @@
 Copyright 2023 Intelligent Measurement Systems LLC
 """
 
-import importlib.resources
+import os
+import runpy
 
 
-def test_getting_started_model():
+def test_getting_started_script():
     """Test that getting started script runs without error."""
-    exec(
-        importlib.resources.files("pvfit.modeling.dc.single_diode.model.demos")
-        .joinpath("getting_started.py")
-        .read_text()
-    )
+    runpy.run_path(os.path.abspath(__file__).replace("_test.py", ".py"))
diff --git a/pvfit/modeling/dc/single_diode/model/demos/using_ghi_dni_dhi_ambient_temp_test.py b/pvfit/modeling/dc/single_diode/model/demos/using_ghi_dni_dhi_ambient_temp_test.py
@@ -0,0 +1,13 @@
+"""
+PVfit testing: Using meteorological (MET) station data in single-diode model (SDM).
+
+Copyright 2023 Intelligent Measurement Systems LLC
+"""
+
+import os
+import runpy
+
+
+def test_using_ghi_dni_dhi_ambient_temp_script():
+    """Test that F and T_degC from MET data script runs without error."""
+    runpy.run_path(os.path.abspath(__file__).replace("_test.py", ".py"))