diff --git a/pytest.ini b/pytest.ini index c5001617428..9be86cb507c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -39,4 +39,3 @@ doctest_optionflags = asyncio_mode = auto markers= linkcheck: Test links - compatmode: Tests a feature of Cylc 7 compatibility mode diff --git a/tests/integration/scripts/test_validate_integration.py b/tests/integration/scripts/test_validate_integration.py index 913be677f96..cce0a5a1fa1 100644 --- a/tests/integration/scripts/test_validate_integration.py +++ b/tests/integration/scripts/test_validate_integration.py @@ -96,7 +96,6 @@ async def test_validate_against_source_gets_old_tvars( validate(src_dir) -@pytest.mark.compatmode def test_validate_simple_graph(flow, validate, caplog): """Test deprecation notice for Cylc 7 simple graph (no recurrence section) """ @@ -114,19 +113,7 @@ def test_validate_simple_graph(flow, validate, caplog): assert expect in caplog.messages -@pytest.mark.parametrize( - 'warning', - ( - " * (7.8.0) [runtime][foo, cat, dog][suite state polling]template - DELETED (OBSOLETE)", - " * (7.8.1) [cylc][events]reset timer - DELETED (OBSOLETE)", - ' * (7.8.1) [cylc][events]reset inactivity timer - DELETED (OBSOLETE)', - ' * (7.8.1) [runtime][foo, cat, dog][events]reset timer - DELETED (OBSOLETE)', - ' * (8.0.0) [runtime][foo, cat, dog][suite state polling] -> [runtime][foo, cat, dog][workflow state polling] - value unchanged', - ' * (8.0.0) [cylc] -> [scheduler] - value unchanged' - ) -) -@pytest.mark.compatmode -def test_pre_cylc8(flow, validate, caplog, warning): +def test_pre_cylc8(flow, validate, caplog): """Test all current non-silent workflow obsoletions and deprecations. """ id_ = flow({ @@ -154,4 +141,19 @@ def test_pre_cylc8(flow, validate, caplog, warning): } }) validate(id_) - assert warning in caplog.messages + for warning in ( + ( + ' * (7.8.0) [runtime][foo, cat, dog][suite state polling]template' + ' - DELETED (OBSOLETE)'), + ' * (7.8.1) [cylc][events]reset timer - DELETED (OBSOLETE)', + ' * (7.8.1) [cylc][events]reset inactivity timer - DELETED (OBSOLETE)', + ( + ' * (7.8.1) [runtime][foo, cat, dog][events]reset timer' + ' - DELETED (OBSOLETE)'), + ( + ' * (8.0.0) [runtime][foo, cat, dog][suite state polling]' + ' -> [runtime][foo, cat, dog][workflow state polling]' + ' - value unchanged'), + ' * (8.0.0) [cylc] -> [scheduler] - value unchanged' + ): + assert warning in caplog.messages