Passed qa after resolving conflicts

C2SM · Nov 8, 2023 · 0d4dddd · 0d4dddd
1 parent 9eae2c1
commit 0d4dddd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 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
@@ -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
@@ -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,
 ):
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -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",
@@ Expand Down @@