Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge marker used for simulation fw models in Everest and Ert #8978

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Merge marker used for simulation fw models in Everest and Ert #8978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/testkomodo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ run_ert_with_opm () {
run_everest_tests () {
python -m pytest tests/everest -s \
--ignore-glob "*test_visualization_entry*" \
-m "not simulation_test and not ui_test"
-m "not requires_eclipse and not ui_test"
xvfb-run -s "-screen 0 640x480x24" --auto-servernum python -m pytest tests/everest -s -m "ui_test"
}

Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ markers = [
"slow",
"everest_models_test",
"integration_test",
"simulation_test",
"ui_test",
"fails_on_macos_github_workflow", # Tests marked fail due to gui-related issues
]
Expand Down
4 changes: 2 additions & 2 deletions tests/everest/test_egg_simulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ def test_init_egg_model(copy_egg_test_data_to_tmp):
@skipif_no_everest_models
@pytest.mark.everest_models_test
@skipif_no_simulator
@pytest.mark.simulation_test
@pytest.mark.requires_eclipse
def test_run_egg_model(copy_egg_test_data_to_tmp):
config = EverestConfig.load_file(CONFIG_FILE)

Expand Down Expand Up @@ -802,7 +802,7 @@ def test_egg_model_wells_json_output_no_none(copy_egg_test_data_to_tmp):
@skipif_no_everest_models
@pytest.mark.everest_models_test
@skipif_no_simulator
@pytest.mark.simulation_test
@pytest.mark.requires_eclipse
@pytest.mark.timeout(0)
def test_egg_snapshot(snapshot, copy_egg_test_data_to_tmp):
# shutil.copytree(relpath(ROOT), tmp_path, dirs_exist_ok=True)
Expand Down
2 changes: 1 addition & 1 deletion tests/everest/test_res_initialization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ def test_summary_default_no_opm(copy_egg_test_data_to_tmp):
assert set(sum_keys[0]) == set(res_conf["SUMMARY"][0])


@pytest.mark.simulation_test
@pytest.mark.requires_eclipse
def test_install_data(copy_test_data_to_tmp):
"""
TODO: When default jobs are handled in Everest this test should not
Expand Down