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

Await everest start_server coroutine in test_everest_output #9442

Merged
merged 2 commits into from
Dec 12, 2024
Merged

Await everest start_server coroutine in test_everest_output #9442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b03a61b
Await everest start_server coroutine in test_everest_output
DanSava Dec 4, 2024
744d302
Replace usage of deprecated logging.warn with logging.warning
DanSava Dec 11, 2024
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
4 changes: 2 additions & 2 deletions src/everest/config_file_loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ def _get_definitions(configuration, configpath):

for key, val in ERT_CONFIG_TEMPLATES.items():
if key in defs:
logging.warn(
logging.warning(
"Internal key {k} specified by user as {u}. "
"Overriding as {v}".format(k=key, u=defs[key], v=val)
)
defs[key] = f"<{val}>" # ert uses <GEO_ID> as format
else:
logging.warn("Empty configuration file provided!")
logging.warning("Empty configuration file provided!")

# If user didn't define a config path, we can insert it here.
defs["configpath"] = defs.get("configpath", configpath)
Expand Down
6 changes: 3 additions & 3 deletions tests/everest/test_everest_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_that_one_experiment_creates_one_ensemble_per_batch(


@pytest.mark.integration_test
def test_everest_output(copy_mocked_test_data_to_tmp):
async def test_everest_output(copy_mocked_test_data_to_tmp):
config_folder = os.getcwd()
config = EverestConfig.load_file("mocked_test_case.yml")
everest_output_dir = config.output_dir
Expand Down Expand Up @@ -75,7 +75,7 @@ def useless_cb(*args, **kwargs):
assert "storage" not in initial_folders
assert DETACHED_NODE_DIR not in initial_folders
makedirs_if_needed(config.output_dir, roll_if_exists=True)
start_server(config)
await start_server(config)

(path, folders, files) = next(os.walk(config_folder))
# Check we are looking at the config folder
Expand All @@ -92,7 +92,7 @@ def useless_cb(*args, **kwargs):
# Check storage folder no longer created in the config folder
assert "storage" not in final_folders
makedirs_if_needed(config.output_dir, roll_if_exists=True)
start_server(config)
await start_server(config)
final_files = os.listdir(config_folder)

# verify two everest_output dirs present
Expand Down
Loading