Merge pull request #6960 from cylc/8.5.x-sync

🤖 Merge 8.5.x-sync into master

Author: hjoliver

cylc/flow/scripts/reinstall.py

@@ -347,7 +347,8 @@ def format_reinstall_output(out: str) -> List[str]:
             # file is present.
             # Skip this line as nothing will happen to this dir.
             continue
-        match = re.match(r'^(.{11}) (send|del\.) (.*)$', line)
+        match = re.match(r'^(.{11}) (send|del\.|recv) (.*)$', line)
+        # (On some systems, may get "recv" instead of "send")
         if match:
             summary, operation, file = match.groups()
             color = 'green' if operation == 'send' else 'red'

tests/integration/test_reinstall.py

@@ -19,9 +19,11 @@
 import asyncio
 from contextlib import asynccontextmanager
 from pathlib import Path
+import re
 from secrets import token_hex
 from types import SimpleNamespace
 
+from ansimarkup import strip as cstrip
 import pytest
 
 from cylc.flow.exceptions import WorkflowFilesError
@@ -45,6 +47,12 @@
 # workflow_running: yes no
 
 
+@pytest.fixture(autouse=True)
+def color_strip(monkeypatch: pytest.MonkeyPatch):
+    """Strip colour as the normal colour stripping doesn't apply to tests."""
+    monkeypatch.setattr('cylc.flow.scripts.reinstall.cparse', cstrip)
+
+
 @pytest.fixture
 def interactive(monkeypatch):
     monkeypatch.setattr(
@@ -312,7 +320,6 @@ async def test_permissions_change(
     one_run,
     interactive,
     answer_prompt,
-    monkeypatch: pytest.MonkeyPatch,
     capsys: pytest.CaptureFixture,
 ):
     """It detects permissions changes."""
@@ -333,7 +340,8 @@ async def test_permissions_change(
         opts=ReInstallOptions(), workflow_id=one_run.id
     )
     out, _ = capsys.readouterr()
-    assert "send myscript" in out
+    # On some systems may get "recv" instead of "send"
+    assert re.search(r'(send|recv) myscript\n', out)
 
 
 @pytest.fixture