diff --git a/tests/test_ri_wellmod.py b/tests/test_ri_wellmod.py index 39b46806f..19b1a3592 100644 --- a/tests/test_ri_wellmod.py +++ b/tests/test_ri_wellmod.py @@ -59,16 +59,6 @@ def file_contains(filename, string_to_find): filetext = Path(filename).read_text(encoding="utf8") 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 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""" @@ -92,9 +82,7 @@ def test_main_initcase(tmp_path, mocker): assert Path(outfile).exists() and file_contains(outfile, "A4") -@pytest.mark.skipif( - github_online_runner(), reason="Cannot run test on github online runner" -) +@pytest.mark.xfail @pytest.mark.skipif( not has_resinsight(), reason="Could not find a ResInsight executable", @@ -242,9 +230,7 @@ def test_ert_forward_model(tmp_path): # REEK TESTS -@pytest.mark.skipif( - github_online_runner(), reason="Cannot run test on github online runner" -) +@pytest.mark.xfail @pytest.mark.skipif( not has_resinsight(), reason="Could not find a ResInsight executable" ) @@ -261,9 +247,7 @@ 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 run test on github online runner" -) +@pytest.mark.xfail @pytest.mark.skipif( not has_resinsight(), reason="Could not find a ResInsight executable" )