Merge pull request #523 from cylc/1.4.x-sync

🤖 Merge 1.4.x-sync into master
cylc · Nov 24, 2023 · 4ba4446 · 4ba4446
2 parents 4eaa333 + 8a547f4
commit 4ba4446
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/cylc/uiserver/tests/test_resolvers.py b/cylc/uiserver/tests/test_resolvers.py
@@ -89,11 +89,14 @@ async def test_cat_log(workflow_run_dir):
     # note - timeout tests that the cat-log process is being stopped correctly
 
     first_response = None
-    async with timeout(10):
+    async with timeout(20):
         ret = services.cat_log(workflow, log, info)
         actual = ''
         is_first = True
         async for response in ret:
+            if err := response.get('error'):
+                # Surface any unexpected errors for better visibility
+                log.exception(err)
             if is_first:
                 first_response = response
                 is_first = False

diff --git a/setup.cfg b/setup.cfg
@@ -56,6 +56,7 @@ install_requires =
     graphql-ws==0.4.4
     jupyter_server>=2.7
     requests
+    psutil
     tornado>=6.1.0  # matches jupyter_server value
     traitlets>=5.2.1  # required for logging_config (5.2.0 had bugs)