Skip to content

Commit

Permalink
Revert gha skip and mark as xfail
Browse files Browse the repository at this point in the history
These tests were all marked as xfail before, and they still fail due to either
resinsight or lack of drogon/reek data.
Marking these again will allow progress until this is resolved.
  • Loading branch information
Andreas Eknes Lie (EDT DSD SD2) committed Mar 4, 2024
1 parent 1d90a2c commit 4558ed5
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions tests/test_ri_wellmod.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand All @@ -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",
Expand Down Expand Up @@ -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"
)
Expand All @@ -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"
)
Expand Down

0 comments on commit 4558ed5

Please sign in to comment.