refactor tests, and only run integration tests on main

openclimatefix · Nov 18, 2024 · 04b43a8 · 04b43a8
1 parent e4e6007
commit 04b43a8
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 1 deletion.
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
@@ -18,3 +18,5 @@ jobs:
       python-version: "['3.11']"
       extra_commands: echo "HF_TOKEN=${{ vars.HF_TOKEN }}" > .env
       pytest_numcpus: '1'
+      # if branch is 'main' then run all tests, if not only run unittests
+      test_dir: ${{ github.ref == 'refs/heads/main' && '' || 'tests/unit' }}
diff --git a/tests/eval/test_evaluation.py → tests/integration/eval/test_evaluation.py b/tests/eval/test_evaluation.py → tests/integration/eval/test_evaluation.py
@@ -1,8 +1,10 @@
 from quartz_solar_forecast.evaluation import run_eval
 import tempfile
 import pandas as pd
+import pytest
 
 
+@pytest.test.integration
 def test_run_eval():
 
     # create a fake dataframe

diff --git a/tests/eval/test_nwp.py → tests/integration/eval/test_nwp.py b/tests/eval/test_nwp.py → tests/integration/eval/test_nwp.py
@@ -1,8 +1,10 @@
 from quartz_solar_forecast.eval.nwp import get_nwp
 import pandas as pd
+import pytest
 
 
 # can take ~ 1 minute to run
+@pytest.test.integration
 def test_get_nwp():
     # make test dataset file
     test_set_df = pd.DataFrame(

diff --git a/tests/eval/test_pv.py → tests/integration/eval/test_pv.py b/tests/eval/test_pv.py → tests/integration/eval/test_pv.py
@@ -1,7 +1,8 @@
 from quartz_solar_forecast.eval.pv import get_pv_truth, get_pv_metadata
 import pandas as pd
+import pytest
 
-
+@pytest.mark.integration
 def test_get_pv_metadata():
     test_set_df = pd.DataFrame(
         [
@@ -16,6 +17,7 @@ def test_get_pv_metadata():
     assert "latitude" in metadata_df.columns
 
 
+@pytest.mark.integration
 def test_get_pv():
     # make test dataset file
     test_set_df = pd.DataFrame(

diff --git a/tests/api_tests/test_api.py → tests/unit/api_tests/test_api.py b/tests/api_tests/test_api.py → tests/unit/api_tests/test_api.py
diff --git a/tests/data/test_make_test_set.py → tests/unit/data/test_make_test_set.py b/tests/data/test_make_test_set.py → tests/unit/data/test_make_test_set.py
diff --git a/tests/data/test_process_pv_data.py → tests/unit/data/test_process_pv_data.py b/tests/data/test_process_pv_data.py → tests/unit/data/test_process_pv_data.py
diff --git a/tests/eval/test_eval_forecast.py → tests/unit/eval/test_eval_forecast.py b/tests/eval/test_eval_forecast.py → tests/unit/eval/test_eval_forecast.py
diff --git a/tests/eval/test_metrics.py → tests/unit/eval/test_metrics.py b/tests/eval/test_metrics.py → tests/unit/eval/test_metrics.py
diff --git a/tests/inverters/test_process_enphase_data.py → ...it/inverters/test_process_enphase_data.py b/tests/inverters/test_process_enphase_data.py → ...it/inverters/test_process_enphase_data.py
diff --git a/tests/inverters/test_victron.py → tests/unit/inverters/test_victron.py b/tests/inverters/test_victron.py → tests/unit/inverters/test_victron.py
diff --git a/tests/test_forecast.py → tests/unit/test_forecast.py b/tests/test_forecast.py → tests/unit/test_forecast.py
diff --git a/tests/test_forecast_no_ts.py → tests/unit/test_forecast_no_ts.py b/tests/test_forecast_no_ts.py → tests/unit/test_forecast_no_ts.py
diff --git a/tests/test_generate_forecast.py → tests/unit/test_generate_forecast.py b/tests/test_generate_forecast.py → tests/unit/test_generate_forecast.py
diff --git a/tests/utils/test_file_path.py → tests/unit/utils/test_file_path.py b/tests/utils/test_file_path.py → tests/unit/utils/test_file_path.py