From 0d4dddd1fca4d1aa8c0717ebc8c5da2f17dfe36c Mon Sep 17 00:00:00 2001 From: Chia Rui Ong Date: Wed, 8 Nov 2023 17:58:20 +0100 Subject: [PATCH] Passed qa after resolving conflicts --- .../atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py | 1 - model/driver/tests/conftest.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py b/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py index c40e45d5ad..81a2d64909 100644 --- a/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py +++ b/model/atmosphere/dycore/tests/dycore_tests/test_solve_nonhydro.py @@ -859,7 +859,6 @@ def test_run_solve_nonhydro_single_step( ) - @pytest.mark.datatest @pytest.mark.parametrize( "istep_init, jstep_init, step_date_init, istep_exit, jstep_exit, step_date_exit", diff --git a/model/driver/tests/conftest.py b/model/driver/tests/conftest.py index 38a6f13497..63088d8697 100644 --- a/model/driver/tests/conftest.py +++ b/model/driver/tests/conftest.py @@ -136,7 +136,7 @@ def timeloop_velocity_savepoint_init( data_provider, # noqa: F811 timeloop_date, timeloop_istep_init, - vn_only_init, # noqa: F811 + vn_only_init, timeloop_jstep_init, ): """