Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace unicode character in cylc show output #6432

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Replace unicode character in cylc show output #6432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cylc/flow/task_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions tests/flakyfunctional/cylc-show/00-simple.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions tests/flakyfunctional/cylc-show/04-multi.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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__'
Expand Down
4 changes: 2 additions & 2 deletions tests/functional/cylc-show/05-complex.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/tui/screenshots/test_show.success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
24 changes: 12 additions & 12 deletions tests/unit/test_task_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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
'''
)

Expand Down
Loading