Remove c char from prereq API dump

cylc · Aug 24, 2024 · 347921f · 347921f
1 parent fafe8e5
commit 347921f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/cylc/flow/prerequisite.py b/cylc/flow/prerequisite.py
@@ -16,7 +16,6 @@
 
 """Functionality for expressing and evaluating logical triggers."""
 
-import math
 import re
 from typing import Iterable, Set, TYPE_CHECKING
 
@@ -232,11 +231,11 @@ def api_dump(self):
                 for s_msg in self.satisfied
             )
         conds = []
-        num_length = math.ceil(len(self.satisfied) / 10)
+        num_length = len(str(len(self.satisfied)))
         for ind, message_tuple in enumerate(sorted(self.satisfied)):
             point, name = message_tuple[0:2]
             t_id = quick_relative_detokenise(point, name)
-            char = 'c%.{0}d'.format(num_length) % ind
+            char = str(ind).zfill(num_length)
             c_msg = self.MESSAGE_TEMPLATE % message_tuple
             c_val = self.satisfied[message_tuple]
             c_bool = bool(c_val)

diff --git a/tests/flakyfunctional/cylc-show/00-simple.t b/tests/flakyfunctional/cylc-show/00-simple.t
@@ -112,10 +112,10 @@ cmp_json "${TEST_NAME}-taskinstance" "${TEST_NAME}-taskinstance" \
         "runtime": {"completion": "(started and succeeded)"},
         "prerequisites": [
             {
-                "expression": "c0",
+                "expression": "0",
                 "conditions": [
                     {
-                        "exprAlias": "c0",
+                        "exprAlias": "0",
                         "taskId": "20141106T0900Z/bar",
                         "reqState": "succeeded",
                         "message": "satisfied naturally",