Merge pull request #6432 from MetRonnie/unicode

Replace unicode character in `cylc show` output
cylc · Oct 21, 2024 · 6005ab5 · 6005ab5
2 parents 0a88f7a + 1edb6dd
commit 6005ab5
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 23 deletions.
diff --git a/cylc/flow/task_outputs.py b/cylc/flow/task_outputs.py
@@ -531,7 +531,7 @@ def color_wrap(string, is_complete):
         ret: List[str] = []
         indent_level: int = 0
         op: Optional[str] = None
-        fence = '⦙'  # U+2999 (dotted fence)
+        fence = '┆'  # U+2506 (Box Drawings Light Triple Dash Vertical)
         for part in RE_EXPR_SPLIT.split(self._completion_expression):
             if not part.strip():
                 continue

diff --git a/tests/flakyfunctional/cylc-show/00-simple.t b/tests/flakyfunctional/cylc-show/00-simple.t
@@ -64,10 +64,10 @@ outputs: ('⨯': not completed)
   ⨯ 20141106T0900Z/foo succeeded
   ⨯ 20141106T0900Z/foo failed
 output completion: incomplete
-    ⦙  (
-  ✓ ⦙    started
-  ⨯ ⦙    and succeeded
-    ⦙  )
+    ┆  (
+  ✓ ┆    started
+  ⨯ ┆    and succeeded
+    ┆  )
 __SHOW_OUTPUT__
 #-------------------------------------------------------------------------------
 TEST_NAME="${TEST_NAME_BASE}-show-json"

diff --git a/tests/flakyfunctional/cylc-show/04-multi.t b/tests/flakyfunctional/cylc-show/04-multi.t
@@ -44,7 +44,7 @@ outputs: ('⨯': not completed)
   ⨯ 2016/t1 succeeded
   ⨯ 2016/t1 failed
 output completion: incomplete
-  ⨯ ⦙  succeeded
+  ⨯ ┆  succeeded
 
 Task ID: 2017/t1
 title: (not given)
@@ -61,7 +61,7 @@ outputs: ('⨯': not completed)
   ⨯ 2017/t1 succeeded
   ⨯ 2017/t1 failed
 output completion: incomplete
-  ⨯ ⦙  succeeded
+  ⨯ ┆  succeeded
 
 Task ID: 2018/t1
 title: (not given)
@@ -78,7 +78,7 @@ outputs: ('⨯': not completed)
   ⨯ 2018/t1 succeeded
   ⨯ 2018/t1 failed
 output completion: incomplete
-  ⨯ ⦙  succeeded
+  ⨯ ┆  succeeded
 __TXT__
 
 contains_ok "${RUND}/show2.txt" <<'__TXT__'

diff --git a/tests/functional/cylc-show/05-complex.t b/tests/functional/cylc-show/05-complex.t
@@ -53,7 +53,7 @@ outputs: ('⨯': not completed)
   ⨯ 20000101T0000Z/f succeeded
   ⨯ 20000101T0000Z/f failed
 output completion: incomplete
-  ⨯ ⦙  succeeded
+  ⨯ ┆  succeeded
 19991231T0000Z/f succeeded
 20000101T0000Z/a succeeded
 20000101T0000Z/b succeeded
@@ -80,7 +80,7 @@ outputs: ('⨯': not completed)
   ⨯ 20000102T0000Z/f succeeded
   ⨯ 20000102T0000Z/f failed
 output completion: incomplete
-  ⨯ ⦙  succeeded
+  ⨯ ┆  succeeded
 20000101T0000Z/f succeeded
 20000102T0000Z/a succeeded
 20000102T0000Z/b succeeded

diff --git a/tests/integration/tui/screenshots/test_show.success.html b/tests/integration/tui/screenshots/test_show.success.html
@@ -23,7 +23,7 @@
 <span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">  ⨯ 1/foo succeeded                         </span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
 <span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">  ⨯ 1/foo failed                            </span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
 <span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">output completion: incomplete               </span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
-<span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">  ⨯ ⦙  succeeded                            </span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
+<span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">  ⨯ ┆  succeeded                            </span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
 <span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">                                            </span><span style="color:#000000;background:#e5e5e5">  </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
 <span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">                                                </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>
 <span style="color:#000000;background:#e5e5e5">               </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5"> q to close                                     </span><span style="color:#000000;background:#e5e5e5">│</span><span style="color:#000000;background:#e5e5e5">               </span>

diff --git a/tests/unit/test_task_outputs.py b/tests/unit/test_task_outputs.py
@@ -223,12 +223,12 @@ def test_format_completion_status():
         indent=2, gutter=2
     ) == '  ' + sstrip(
         '''
-          ⦙  (
-        ⨯ ⦙    succeeded
-        ⨯ ⦙    and x
-        ⨯ ⦙    and y
-          ⦙  )
-        ⨯ ⦙  or expired
+          ┆  (
+        ⨯ ┆    succeeded
+        ⨯ ┆    and x
+        ⨯ ┆    and y
+          ┆  )
+        ⨯ ┆  or expired
         '''
     )
     outputs.set_message_complete('succeeded')
@@ -237,12 +237,12 @@ def test_format_completion_status():
         indent=2, gutter=2
     ) == '  ' + sstrip(
         '''
-          ⦙  (
-        ✓ ⦙    succeeded
-        ✓ ⦙    and x
-        ⨯ ⦙    and y
-          ⦙  )
-        ⨯ ⦙  or expired
+          ┆  (
+        ✓ ┆    succeeded
+        ✓ ┆    and x
+        ⨯ ┆    and y
+          ┆  )
+        ⨯ ┆  or expired
         '''
     )