refinement of regex

Author: wxtim

cylc/flow/graph_parser.py

@@ -186,7 +186,7 @@ class GraphParser:
 
     # Match @xtriggers.
     REC_XTRIG = re.compile(r'@[\w\-+%]+')
-    REC_XTRIG_OR = re.compile(r'@.*\s*\|\s*@.*')
+    REC_XTRIG_OR = re.compile(r'@.*\|.*|.*\|.*@.*')
 
     # Match fully qualified parameterized single nodes.
     REC_NODE_FULL = re.compile(

tests/integration/test_config.py

@@ -35,6 +35,7 @@
 from cylc.flow.pathutil import get_workflow_run_pub_db_path
 
 Fixture = Any
+param = pytest.param
 
 
 @pytest.mark.parametrize(
@@ -489,9 +490,20 @@ def test_xtrig_signature_validation(
         validate(id_)
 
 
+@pytest.mark.parametrize(
+    'left',
+    (
+        param('@xrandom | @echo', id='xtrig-or-xtrig'),
+        param('@xrandom | task', id='xtrig-or-task'),
+        param('task | @echo', id='task-or-xtrig'),
+        param('@xrandom | foo & bar', id='xtrig-or-complex'),
+        param('@xrandom & bar | foo', id='complex-or-xtrig'),
+    )
+)
 def test_xtrig_or_fails_validation(
     flow: "Fixture",
     validate: "Fixture",
+    left: str
 ):
     """Xtriggers cannot be chained with the 'or'
 
@@ -506,7 +518,7 @@ def test_xtrig_or_fails_validation(
                     "xrandom": "xrandom(100)",
                     "echo": "echo(succeed=True)"
                 },
-                "graph": {"R1": "@xrandom | @echo => foo"},
+                "graph": {"R1": f"{left} => fin"},
             }
         }
     )