From 693e8aeb08fa4eabed8edbeb6014ae4712eed83f Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Mon, 6 Nov 2023 10:49:52 +0000
Subject: [PATCH 1/2] Add missing dependency on psutil

---
 setup.cfg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.cfg b/setup.cfg
index 60f300d3..aded9d17 100644
--- 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)
 

From 7ff3c16ae5d35c88f38c43b50b90d8285e441be5 Mon Sep 17 00:00:00 2001
From: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com>
Date: Wed, 22 Nov 2023 13:49:48 +0000
Subject: [PATCH 2/2] Improve cat-log test failure debuggability

---
 cylc/uiserver/tests/test_resolvers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cylc/uiserver/tests/test_resolvers.py b/cylc/uiserver/tests/test_resolvers.py
index 7ebd0993..ad8d58aa 100644
--- 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