From 3c46c8a9b298da55a7d50a11c640ee8862b4cdde Mon Sep 17 00:00:00 2001 From: Mathilde Leuridan Date: Fri, 8 Dec 2023 15:16:40 +0100 Subject: [PATCH] special mark for fdb tests --- .github/workflows/ci.yaml | 2 +- pyproject.toml | 3 ++- tests/test_fdb_datacube.py | 2 +- tests/test_incomplete_tree_fdb.py | 4 ++-- tests/test_regular_grid.py | 2 +- tests/test_slice_date_range_fdb.py | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 017d4bf0e..56b8e7ee0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -131,7 +131,7 @@ jobs: LD_LIBRARY_PATH: ${{ steps.install-dependencies.outputs.lib_path }} shell: bash -eux {0} run: | - DYLD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }} python -m pytest tests --cov=./ --cov-report=xml + DYLD_LIBRARY_PATH=${{ env.LD_LIBRARY_PATH }} python -m pytest -m "not fdb" tests --cov=./ --cov-report=xml python -m coverage report - name: Upload coverage to Codecov diff --git a/pyproject.toml b/pyproject.toml index 28f4ec600..d9a2e1f4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,4 +4,5 @@ line-length = 120 requires = ["setuptools>=61.0"] build-backend = "setuptools.build_meta" [tool.pytest.ini_options] -markers = ["internet: downloads test data from the internet (deselect with '-m \"not internet\"')",] \ No newline at end of file +markers = ["internet: downloads test data from the internet (deselect with '-m \"not internet\"')", + "fdb: test which uses fdb (deselect with '-m \"not fdb\"')",] \ No newline at end of file diff --git a/tests/test_fdb_datacube.py b/tests/test_fdb_datacube.py index d846b91fb..a018da9b9 100644 --- a/tests/test_fdb_datacube.py +++ b/tests/test_fdb_datacube.py @@ -25,7 +25,7 @@ def setup_method(self, method): self.API = Polytope(datacube=self.fdbdatacube, engine=self.slicer, axis_options=self.options) # Testing different shapes - @pytest.mark.skip(reason="can't install fdb branch on CI") + @pytest.mark.fdb def test_fdb_datacube(self): request = Request( Select("step", [0]), diff --git a/tests/test_incomplete_tree_fdb.py b/tests/test_incomplete_tree_fdb.py index 40fd5933e..a3d4ace62 100644 --- a/tests/test_incomplete_tree_fdb.py +++ b/tests/test_incomplete_tree_fdb.py @@ -49,7 +49,7 @@ def find_nearest_latlon(self, grib_file, target_lat, target_lon): return nearest_points @pytest.mark.internet - @pytest.mark.skip(reason="can't install fdb branch on CI") + @pytest.mark.fdb def test_incomplete_fdb_branch(self): request = Request( Select("step", [0]), @@ -72,7 +72,7 @@ def test_incomplete_fdb_branch(self): assert result.is_root() @pytest.mark.internet - @pytest.mark.skip(reason="can't install fdb branch on CI") + @pytest.mark.fdb def test_incomplete_fdb_branch_2(self): request = Request( Select("step", [0]), diff --git a/tests/test_regular_grid.py b/tests/test_regular_grid.py index 506cd0cf2..536b386ca 100644 --- a/tests/test_regular_grid.py +++ b/tests/test_regular_grid.py @@ -52,7 +52,7 @@ def find_nearest_latlon(self, grib_file, target_lat, target_lon): return nearest_points @pytest.mark.internet - @pytest.mark.skip(reason="can't install fdb branch on CI") + @pytest.mark.fdb def test_regular_grid(self): request = Request( Select("step", [0]), diff --git a/tests/test_slice_date_range_fdb.py b/tests/test_slice_date_range_fdb.py index a233e2c26..11dba9646 100644 --- a/tests/test_slice_date_range_fdb.py +++ b/tests/test_slice_date_range_fdb.py @@ -22,7 +22,7 @@ def setup_method(self, method): self.API = Polytope(datacube=self.fdbdatacube, engine=self.slicer, axis_options=self.options) # Testing different shapes - @pytest.mark.skip(reason="can't install fdb branch on CI") + @pytest.mark.fdb def test_fdb_datacube(self): request = Request( Select("step", [0]),