Fix.no validation of outputs from graph singletons

changes.d/6583.fix.md

@@ -0,0 +1 @@
+Fix bug where graph items with undefined outputs were missed at validation if the graph item was not an upstream dependency of another graph item.

cylc/flow/config.py

@@ -1844,6 +1844,7 @@
 
         triggers = {}
         xtrig_labels = set()
+
         for left in left_nodes:
             if left.startswith('@'):
                 xtrig_labels.add(left[1:])
@@ -1859,10 +1860,6 @@
                 # Qualifier is a custom task message.
                 qualifier = outputs[output]
             elif output:
-                if not TaskOutputs.is_valid_std_name(output):
-                    raise WorkflowConfigError(
-                        f"Undefined custom output: {name}:{output}"
-                    )
                 qualifier = output
             else:
                 # No qualifier specified => use "succeeded".
@@ -2278,6 +2275,25 @@
         for tdef in self.taskdefs.values():
             tdef.tweak_outputs()
 
+    def check_outputs(self, tasks_and_ouputs):
+        """Check that task outputs have been registered with tasks.
+
+        TODO - have a bit more of a think about whether the try except is
+        safe
+        """
+        for task, output in tasks_and_ouputs:
+            try:
+                registered_outputs = self.cfg['runtime'][task]['outputs']
+            except KeyError:
+                registered_outputs = []
+            if (
+                not TaskOutputs.is_valid_std_name(output)
+                and output not in registered_outputs
+            ):
+                raise WorkflowConfigError(
+                    f"Undefined custom output: {task}:{output}"
+                )
+
     def _proc_triggers(self, parser, seq, task_triggers):
         """Define graph edges, taskdefs, and triggers, from graph sections."""
         suicides = 0

tests/integration/test_dbstatecheck.py

@@ -45,7 +45,10 @@ async def checker(
         },
         'runtime': {
             'bad': {'simulation': {'fail cycle points': '1000'}},
-            'output': {'outputs': {'trigger': 'message'}}
+            'output': {'outputs': {
+                'trigger': 'message',
+                'custom_output': 'x'
+            }}
         }
     })
     schd: Scheduler = mod_scheduler(wid, paused_start=False)
@@ -119,13 +122,13 @@ def test_output(checker):
             'output',
             '10000101T0000Z',
             "{'submitted': 'submitted', 'started': 'started', 'succeeded': "
-            "'succeeded', 'trigger': 'message'}",
+            "'succeeded', 'trigger': 'message', 'custom_output': 'x'}",
         ],
         [
             'output',
             '10010101T0000Z',
             "{'submitted': 'submitted', 'started': 'started', 'succeeded': "
-            "'succeeded', 'trigger': 'message'}",
+            "'succeeded', 'trigger': 'message', 'custom_output': 'x'}",
         ],
     ]
     assert result == expect

tests/integration/test_optional_outputs.py

@@ -288,14 +288,11 @@ def implicit_completion_config(mod_flow, mod_validate):
         },
         'runtime': {
             'root': {
-                'outputs': {
-                    'x': 'xxx',
-                    'y': 'yyy',
-                    'z': 'zzz',
-                }
+                'outputs': {n: f'{n}{n}{n}' for n in 'abcdefghijklxyz'}
             }
         }
     })
+
     return mod_validate(id_)
 
 
@@ -322,13 +319,15 @@ async def test_implicit_completion_expression(
     implicit_completion_config,
     task,
     condition,
+    monkeypatch,
 ):
     """It should generate a completion expression from the graph.
 
     If no completion expression is provided in the runtime section, then it
     should auto generate one inferring whether outputs are required or not from
     the graph.
     """
+    # monkeypatch.setattr('cylc.flow.config.WorkflowConfig.check_outputs', lambda *_: None)
     completion_expression = get_completion_expression(
         implicit_completion_config.taskdefs[task]
     )

tests/unit/test_config.py

@@ -1175,13 +1175,16 @@ def WorkflowConfig__assert_err_raised():
         WorkflowConfig__assert_err_raised()
 
 
-def test_undefined_custom_output(tmp_flow_config: Callable):
+@pytest.mark.parametrize(
+    'graph', (('foo:x => bar'), ('foo:x'))
+)
+def test_undefined_custom_output(graph: str, tmp_flow_config: Callable):
     """Test error on undefined custom output referenced in graph."""
     id_ = 'custom_out1'
-    flow_file = tmp_flow_config(id_, """
+    flow_file = tmp_flow_config(id_, f"""
     [scheduling]
         [[graph]]
-            R1 = "foo:x => bar"
+            R1 = "{graph}"
     [runtime]
         [[foo, bar]]
     """)