From 91a53de216484e398ee1f735510356785e4330e4 Mon Sep 17 00:00:00 2001 From: Matt Hall Date: Wed, 31 May 2023 15:45:36 +0200 Subject: [PATCH] Allow for ert4 or ert5 storage service --- tests/data/spe1_st/tests/conftest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/data/spe1_st/tests/conftest.py b/tests/data/spe1_st/tests/conftest.py index cb6b8e4e..b9867978 100644 --- a/tests/data/spe1_st/tests/conftest.py +++ b/tests/data/spe1_st/tests/conftest.py @@ -3,8 +3,11 @@ @pytest.fixture(scope="session", autouse=True) def start_storage_server(): - from ert.services import StorageService + try: + from ert.services import StorageService as Storage + except ImportError: + from ert.services import Storage - with StorageService.start_server() as service: + with Storage.start_server() as service: service.wait_until_ready(timeout=30) yield service