Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/equinor/webviz-ert into main
Browse files Browse the repository at this point in the history
  • Loading branch information
kwinkunks committed Mar 29, 2023
2 parents a6c2179 + d66eae6 commit 2cdb59b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/data/spe1_st/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

@pytest.fixture(scope="session", autouse=True)
def start_storage_server():
from ert.services import Storage
from ert.services import StorageService

with Storage.start_server() as service:
with StorageService.start_server() as service:
service.wait_until_ready(timeout=30)
yield service
4 changes: 4 additions & 0 deletions tests/data/spe1_st/tests/test_webviz_ert.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ def _verify_keys_in_menu(dash_duo_handle, plugin, keys, selector):


@pytest.mark.spe1
@pytest.mark.xfail(reason="Fails because ert>5 no longer supports ert-storage")
def test_webviz_parameter_comparison(dash_duo):
plugin = setup_plugin(dash_duo, __name__, ParameterComparison)

Expand All @@ -45,6 +46,7 @@ def test_webviz_parameter_comparison(dash_duo):


@pytest.mark.spe1
@pytest.mark.xfail(reason="Fails because ert>5 no longer supports ert-storage")
def test_webviz_response_correlation(dash_duo):
plugin = setup_plugin(dash_duo, __name__, ResponseCorrelation)

Expand Down Expand Up @@ -84,6 +86,7 @@ def test_webviz_response_correlation(dash_duo):


@pytest.mark.spe1
@pytest.mark.xfail(reason="Fails because ert>5 no longer supports ert-storage")
def test_webviz_response_comparison(dash_duo):
plugin = setup_plugin(dash_duo, __name__, ResponseComparison)

Expand Down Expand Up @@ -119,6 +122,7 @@ def test_webviz_response_comparison(dash_duo):


@pytest.mark.spe1
@pytest.mark.xfail(reason="Fails because ert>5 no longer supports ert-storage")
def test_webviz_observation_analyzer(dash_duo):
plugin = setup_plugin(dash_duo, __name__, ObservationAnalyzer)

Expand Down

0 comments on commit 2cdb59b

Please sign in to comment.