diff --git a/tests/functional/deprecations/04-simple-graph.t b/tests/functional/deprecations/04-simple-graph.t deleted file mode 100644 index c708c6e64f3..00000000000 --- a/tests/functional/deprecations/04-simple-graph.t +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env bash -# THIS FILE IS PART OF THE CYLC WORKFLOW ENGINE. -# Copyright (C) NIWA & British Crown (Met Office) & Contributors. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -#------------------------------------------------------------------------------- -# Test deprecation notice for Cylc 7 simple graph (no recurrence section) - -. "$(dirname "$0")/test_header" -set_test_number 2 - -init_workflow "${TEST_NAME_BASE}" << __FLOW__ -[scheduler] - allow implicit tasks = True -[scheduling] - [[dependencies]] - graph = foo -__FLOW__ - -TEST_NAME="${TEST_NAME_BASE}-validate" -run_ok "$TEST_NAME" cylc validate -v "$WORKFLOW_NAME" - -TEST_NAME="${TEST_NAME_BASE}-cmp" -cylc validate "$WORKFLOW_NAME" 2> 'val.out' -cmp_ok val.out <<__END__ -WARNING - deprecated graph items were automatically upgraded in "workflow definition": -${LOG_INDENT} * (8.0.0) [scheduling][dependencies][X]graph -> [scheduling][graph]X - for X in: -${LOG_INDENT} graph -__END__ - -purge diff --git a/tests/integration/scripts/test_validate_integration.py b/tests/integration/scripts/test_validate_integration.py index e271726dafb..bc6a751e935 100644 --- a/tests/integration/scripts/test_validate_integration.py +++ b/tests/integration/scripts/test_validate_integration.py @@ -94,3 +94,18 @@ async def test_validate_against_source_gets_old_tvars( flow_file.read_text().replace('P1Y = foo', 'P1Y = {{FOO}}')) with pytest.raises(Jinja2Error): validate(src_dir) + + +def test_validate_simple_graph(flow, validate, caplog): + id_ = flow({ + 'scheduler': {'allow implicit tasks': True}, + 'scheduling': {'dependencies': {'graph': 'foo'}} + }) + validate(id_) + expect = ( + 'deprecated graph items were automatically upgraded ' + 'in "workflow definition":' + '\n * (8.0.0) [scheduling][dependencies][X]graph' + ' -> [scheduling][graph]X - for X in:\n graph' + ) + assert expect in caplog.messages \ No newline at end of file