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.

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

Fix RealizationState vs RealizationStorageState imports and usage #6665

Merged
merged 1 commit into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 tests/unit_tests/simulator/test_batch_sim.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import pytest

from ert.config import ErtConfig
from ert.realization_state import RealizationState
from ert.job_queue import RealizationState
from ert.simulator import BatchSimulator


Expand Down
7 changes: 4 additions & 3 deletions tests/unit_tests/simulator/test_simulation_context.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from ert.enkf_main import EnKFMain
from ert.realization_state import RealizationState
from ert.job_queue import RealizationState
from ert.simulator import SimulationContext
from ert.storage import RealizationStorageState
from tests.utils import wait_until


Expand Down Expand Up @@ -64,10 +65,10 @@ def test_simulation_context(setup_case, storage):
assert not even_ctx.didRealizationFail(iens)
assert even_ctx.isRealizationFinished(iens)

assert even_half.state_map[iens] == RealizationState.HAS_DATA
assert even_half.state_map[iens] == RealizationStorageState.HAS_DATA
else:
assert odd_ctx.didRealizationSucceed(iens)
assert not odd_ctx.didRealizationFail(iens)
assert odd_ctx.isRealizationFinished(iens)

assert odd_half.state_map[iens] == RealizationState.HAS_DATA
assert odd_half.state_map[iens] == RealizationStorageState.HAS_DATA