Skip to content

Fix test skipping logic in debug-mode emulation tests #382

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

Merged
spencerkclark merged 1 commit into from
Sep 7, 2023
Merged

Fix test skipping logic in debug-mode emulation tests #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,19 @@ jobs:
- run:
name: Test wrapper
command: nix-shell --run "make -C FV3/wrapper test_emulation"
nix-emulation-debug:
docker:
- image: nixos/nix
environment:
FV3CONFIG_CACHE_DIR: /tmp/.fv3config
GOOGLE_APPLICATION_CREDENTIALS: /tmp/key.json
FSSPEC_GS_REQUESTER_PAYS: vcm-ml
steps:
- initialize_nix
- build_debug
- run:
name: Test fortran
command: nix-shell --run "make test_fortran_emulation"
nix-unmarked-repro:
docker:
- image: nixos/nix
Expand Down Expand Up @@ -232,20 +245,28 @@ workflows:
filters:
branches:
ignore: master
- hold-nix-emulation-repro:
- hold-nix-emulation:
name: Launch emulation tests
type: approval
filters:
branches:
ignore: master
- nix-emulation-repro:
name: Emulation tests
name: Emulation tests in repro mode
requires:
- Minimal fortran and wrapper tests in repro mode
- Launch emulation tests
filters:
branches:
ignore: master
- nix-emulation-debug:
name: Emulation tests in debug mode
requires:
- Minimal fortran tests in debug mode
- Launch emulation tests
filters:
branches:
ignore: master
- hold-nix-unmarked-repro:
name: Launch unmarked fortran tests
type: approval
Expand Down
4 changes: 2 additions & 2 deletions tests/pytest/test_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def test_use_prescribed_sea_surface_properties_error(executable, tmpdir, message
@pytest.fixture(scope="session")
def emulation_run(executable, tmpdir_factory):
if "debug" in str(executable):
pytest.skip(reason=EMULATION_DEBUG_MODE_ISSUE)
pytest.skip(EMULATION_DEBUG_MODE_ISSUE)

config = get_config("emulation.yml")
rundir = tmpdir_factory.mktemp("rundir")
Expand Down Expand Up @@ -264,7 +264,7 @@ def test_zhao_carr_diagnostics(emulation_run, regtest, tile):
@pytest.mark.emulation
def test_gscond_logs(executable, regtest, tmpdir):
if "debug" in str(executable):
pytest.skip(reason=EMULATION_DEBUG_MODE_ISSUE)
pytest.skip(EMULATION_DEBUG_MODE_ISSUE)

config = get_config("emulation.yml")
config["namelist"]["gfs_physics_nml"]["emulate_gscond_only"] = True
Expand Down