From cdc7d50a54b7aa3ab1d36b91e3d7777c88a96336 Mon Sep 17 00:00:00 2001
From: amercader <amercadero@gmail.com>
Date: Mon, 8 Jul 2024 10:54:40 +0200
Subject: [PATCH] Rerun failures

---
 .github/workflows/test.yml       | 11 +++++++----
 ckanext/dcat/tests/test_shacl.py | 21 ---------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 61c6c1ff..241d57e7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -54,16 +54,19 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install requirements
+
+    - name: Install requirements (common)
       run: |
         pip install -r requirements.txt
         pip install -r dev-requirements.txt
-    - name: Install requirements (common)
-      run: |
         pip install -e .
         # Replace default path to CKAN core config file with the one on the container
         sed -i -e 's/use = config:.*/use = config:\/srv\/app\/src\/ckan\/test-core.ini/' test.ini
-    - name: Setup other extension
+    - name: Install requirements (2.9)
+      run: |
+        pip install -U pytest-rerunfailures
+      if: ${{ matrix.ckan-version == '2.9' }}
+    - name: Setup other extensions
       run: |
         git clone https://github.com/ckan/ckanext-harvest
         pip install -e ckanext-harvest
diff --git a/ckanext/dcat/tests/test_shacl.py b/ckanext/dcat/tests/test_shacl.py
index ada8c79d..6478e8cf 100644
--- a/ckanext/dcat/tests/test_shacl.py
+++ b/ckanext/dcat/tests/test_shacl.py
@@ -197,24 +197,3 @@ def test_validate_dcat_ap_2_graph_shapes_recommended(graph):
     r = validate(graph, shacl_graph=path)
     conforms, results_graph, results_text = r
     assert conforms, results_text
-
-
-@pytest.mark.usefixtures("with_plugins")
-@pytest.mark.ckan_config("ckan.plugins", "dcat scheming_datasets")
-@pytest.mark.ckan_config(
-    "scheming.dataset_schemas", "ckanext.dcat.schemas:dcat_ap_2.1_full.yaml"
-)
-@pytest.mark.ckan_config(
-    "scheming.presets",
-    "ckanext.scheming:presets.json ckanext.dcat.schemas:presets.yaml",
-)
-@pytest.mark.ckan_config(
-    "ckanext.dcat.rdf.profiles", "euro_dcat_ap_2 euro_dcat_ap_scheming"
-)
-def test_validate_dcat_ap_2_graph_shapes_range(graph):
-
-    # dcat-ap_2.1.1_shacl_range.ttl: constraints concerning object range
-    path = _get_shacl_file_path("dcat-ap_2.1.1_shacl_range.ttl")
-    r = validate(graph, shacl_graph=path)
-    conforms, results_graph, results_text = r
-    assert conforms, results_text