Implemented usage of CylcError

Author: ChrisPaulBennett

cylc/flow/scripts/profiler.py

@@ -31,9 +31,10 @@
 from functools import partial
 from dataclasses import dataclass
 
-from cylc.flow.network.client_factory import get_client
-from cylc.flow.option_parsers import CylcOptionParser as COP
+from cylc.flow.exceptions import CylcError
 from cylc.flow.terminal import cli_function
+from cylc.flow.option_parsers import CylcOptionParser as COP
+from cylc.flow.network.client_factory import get_client
 
 
 PID_REGEX = re.compile(r"([^:]*\d{6,}.*)")
@@ -117,6 +118,8 @@ def parse_memory_file(process: Process):
                 if "total_rss" in line:
                     return int(''.join(filter(str.isdigit, line)))
 
+    raise CylcError("Unable to find memory usage data")
+
 
 def parse_memory_allocated(process: Process) -> int:
     """Open the memory stat file and copy the appropriate data"""
@@ -148,7 +151,7 @@ def parse_cpu_file(process: Process) -> int:
                 # Cgroups v1 uses nanoseconds
                 return int(line) // 1000000
 
-    raise ValueError("Unable to find cpu usage data")
+    raise CylcError("Unable to find cpu usage data")
 
 
 def get_cgroup_version(cgroup_location: str, cgroup_name: str) -> int:
@@ -177,8 +180,8 @@ def get_cgroup_name():
         result = PID_REGEX.search(result).group()
         return result
     except FileNotFoundError as err:
-        raise FileNotFoundError(
-            '/proc/' + str(pid) + '/cgroup not found') from err
+        raise CylcError(
+            '/proc/' + str(pid) + '/cgroup not found') from None
 
     except AttributeError as err:
         raise AttributeError("No cgroup found for process:", pid) from err
@@ -206,7 +209,7 @@ def get_cgroup_paths(location) -> Process:
             memory_allocated_path="",
             cgroup_version=cgroup_version,
         )
-    raise ValueError("Unable to determine cgroup version")
+    raise CylcError("Unable to determine cgroup version")
 
 
 def profile(_process: Process, delay, keep_looping=lambda: True):

tests/unit/scripts/test_profiler.py

@@ -27,15 +27,13 @@
                                         Process)
 import pytest
 from unittest import mock
+from cylc.flow.exceptions import CylcError
 
 
 def test_stop_profiler(mocker, monkeypatch, tmpdir):
     monkeypatch.setenv('CYLC_WORKFLOW_ID', "test_value")
 
-    def mock_get_client(env_var, timeout=None):
-        return True
-
-    class MockedClient():
+    class MockedClient:
         def __init__(self, *a, **k):
             pass
 
@@ -45,7 +43,7 @@ async def async_request(self, *a, **k):
     mocker.patch("cylc.flow.scripts.profiler.get_client", MockedClient)
 
     mem_file = tmpdir.join("memory_file.txt")
-    mem_file.write('1234')
+    mem_file.write('total_rss 1234')
     cpu_file = tmpdir.join("cpu_file.txt")
     cpu_file.write('5678')
     mem_allocated_file = tmpdir.join("memory_allocated.txt")
@@ -251,7 +249,7 @@ def mock_os_pid():
         return 'The Thing That Should Not Be'
 
     mocker.patch("os.getpid", mock_os_pid)
-    with pytest.raises(FileNotFoundError):
+    with pytest.raises(CylcError):
         get_cgroup_name()
 
 
@@ -297,7 +295,7 @@ def test_get_cgroup_paths(mocker):
                  return_value='test_name')
     mocker.patch("cylc.flow.scripts.profiler.get_cgroup_version",
                  return_value=3)
-    with pytest.raises(ValueError):
+    with pytest.raises(CylcError):
         get_cgroup_paths("test_location/")