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

Have integration tests run with both scheduler and job queue #6787

Merged
merged 3 commits into from
Dec 20, 2023
Merged

Have integration tests run with both scheduler and job queue #6787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
726ce03
Move integration tests to separate directory
jonathan-eq Dec 14, 2023
f1f6919
Have integration tests run with both queue and scheduler
jonathan-eq Dec 14, 2023
83134a0
Move pytest snapshots down one level
jonathan-eq Dec 14, 2023
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
0 tests/unit_tests/status/__init__.py → tests/integration_tests/analysis/__init__.py
View file
Open in desktop
File renamed without changes.
17 changes: 17 additions & 0 deletions ...analysis/snapshots/test_es_update/test_update_only_using_subset_observations/0/update_log
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
======================================================================================================================================================
Time:
Parent ensemble: default_0
Target ensemble: new_ensemble
Alpha: 3.0
Global scaling: 1.0
Standard cutoff: 1e-06
Run id: id
Update step: DISABLED_OBSERVATIONS
------------------------------------------------------------------------------------------------------------------------------------------------------
Observed history | Simulated data | Status
------------------------------------------------------------------------------------------------------------------------------------------------------
1 : FOPR 0.008 +/- 0.100 | 0.079 +/- 0.107 | Active
2 : WPR_DIFF_1 0.000 +/- 0.100 | -0.011 +/- 0.060 | Active
3 : WPR_DIFF_1 0.100 +/- 0.200 | 0.081 +/- 0.126 | Active
4 : WPR_DIFF_1 0.200 +/- 0.150 | 0.073 +/- 0.130 | Active
5 : WPR_DIFF_1 0.000 +/- 0.050 | 0.127 +/- 0.125 | Active
222 changes: 222 additions & 0 deletions ...integration_tests/analysis/snapshots/test_es_update/test_update_report/0-False/update_log
View file
Open in desktop

Large diffs are not rendered by default.

222 changes: 222 additions & 0 deletions .../integration_tests/analysis/snapshots/test_es_update/test_update_report/0-True/update_log
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions ...ts/analysis/test_adaptive_localization.py → ...ts/analysis/test_adaptive_localization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,11 @@ def run_cli_ES_with_case(poly_config):
return prior_sample, posterior_sample


@pytest.mark.scheduler
@pytest.mark.integration_test
def test_that_adaptive_localization_with_cutoff_1_equals_ensemble_prior(copy_poly_case):
def test_that_adaptive_localization_with_cutoff_1_equals_ensemble_prior(
copy_poly_case, try_queue_and_scheduler, monkeypatch
):
set_adaptive_localization_1 = dedent(
"""
ANALYSIS_SET_VAR STD_ENKF LOCALIZATION True
Expand All @@ -65,8 +68,11 @@ def test_that_adaptive_localization_with_cutoff_1_equals_ensemble_prior(copy_pol
assert np.allclose(posterior_sample, prior_sample)


@pytest.mark.scheduler
@pytest.mark.integration_test
def test_that_adaptive_localization_with_cutoff_0_equals_ESupdate(copy_poly_case):
def test_that_adaptive_localization_with_cutoff_0_equals_ESupdate(
copy_poly_case, try_queue_and_scheduler, monkeypatch
):
"""
Note that "RANDOM_SEED" in both ert configs needs to be the same to obtain
the same sample from the prior.
Expand Down Expand Up @@ -101,8 +107,11 @@ def test_that_adaptive_localization_with_cutoff_0_equals_ESupdate(copy_poly_case
assert np.allclose(posterior_sample_loc0, posterior_sample_noloc)


@pytest.mark.scheduler
@pytest.mark.integration_test
def test_that_posterior_generalized_variance_increases_in_cutoff(copy_poly_case):
def test_that_posterior_generalized_variance_increases_in_cutoff(
copy_poly_case, try_queue_and_scheduler, monkeypatch
):
rng = np.random.default_rng(42)
cutoff1 = rng.uniform(0, 1)
cutoff2 = rng.uniform(cutoff1, 1)
Expand Down
Loading
Loading