Fix test ri_wellmod

equinor · Mar 5, 2024 · 28dfde0 · 28dfde0
1 parent 98679e6
commit 28dfde0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/.github/workflows/subscript.yml b/.github/workflows/subscript.yml
@@ -52,10 +52,7 @@ jobs:
 
       - name: Force correct RIPS version
         run: |
-          ResInsight --console --help | grep "ResInsight v. 2021.06" \
-            && pip install rips==2021.6.0.1 || true
-          ResInsight --console --help | grep "ResInsight v. 2020.10" \
-            && pip install rips==2020.10.0.2 || true
+          pip install rips~=`ResInsight --console --help | grep "ResInsight v." | cut -d ' ' -f 3 | sed 's/\b0\+\([1-9]\)/\1/g'`
 
       - name: List all installed packages
         run: pip freeze

diff --git a/tests/test_ri_wellmod.py b/tests/test_ri_wellmod.py
@@ -60,14 +60,6 @@ def file_contains(filename, string_to_find):
     return filetext.find(string_to_find) >= 0
 
 
-def github_online_runner():
-    gh_runner = os.getenv("GITHUB_ACTIONS") == "true"
-
-    # we still want to run tests on github actions local (komodo) runners
-    local_gh_runner = "f_scout_ci" in str(os.getenv("RUNNER_NAME"))
-    return gh_runner and not local_gh_runner
-
-
 @pytest.mark.integration
 def test_integration():
     """Test that endpoint is installed"""
@@ -91,9 +83,6 @@ def test_main_initcase(tmp_path, mocker):
     assert Path(outfile).exists() and file_contains(outfile, "A4")
 
 
-@pytest.mark.skipif(
-    github_online_runner(), reason="Cannot test on github online runner"
-)
 @pytest.mark.skipif(
     not has_resinsight(),
     reason="Could not find a ResInsight executable",
@@ -241,9 +230,6 @@ def test_ert_forward_model(tmp_path):
 
 
 # REEK TESTS
-@pytest.mark.skipif(
-    github_online_runner(), reason="Cannot test on github online runner"
-)
 @pytest.mark.skipif(
     not has_resinsight(), reason="Could not find a ResInsight executable"
 )
@@ -260,9 +246,6 @@ def test_main_initcase_reek(tmp_path, mocker):
     assert Path(outfile).exists() and file_contains(outfile, "OP_1")
 
 
-@pytest.mark.skipif(
-    github_online_runner(), reason="Cannot test on github online runner"
-)
 @pytest.mark.skipif(
     not has_resinsight(), reason="Could not find a ResInsight executable"
 )