Minor cleanup

PandABlocks · Jun 4, 2024 · 0289178 · 0289178
1 parent 0a6e2a1
commit 0289178
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/src/pandablocks_ioc/_hdf_ioc.py b/src/pandablocks_ioc/_hdf_ioc.py
@@ -591,9 +591,6 @@ async def _update_directory_path(self, new_val) -> None:
 
         logging.debug(f"Need to create {dirs_to_create} directories.")
 
-        # Default message is "OK"
-        status_msg = "OK"
-
         # Case where all dirs exist
         if dirs_to_create == 0:
             if os.access(new_path, os.W_OK):
@@ -617,12 +614,11 @@ async def _update_directory_path(self, new_val) -> None:
             status_msg = f"Need to create {dirs_to_create} > {max_dirs_to_create} dirs."
             self._directory_exists_record.set(0)
 
-        sevr = alarm.NO_ALARM
-        alrm = alarm.NO_ALARM
         if self._directory_exists_record.get() == 0:
             sevr = alarm.MAJOR_ALARM, alrm = alarm.STATE_ALARM
             logging.error(status_msg)
         else:
+            sevr = alarm.NO_ALARM, alrm = alarm.NO_ALARM
             logging.debug(status_msg)
 
         self._status_message_record.set(status_msg, severity=sevr, alarm=alrm)

diff --git a/tests/test_hdf_ioc.py b/tests/test_hdf_ioc.py
@@ -619,7 +619,7 @@ async def test_hdf5_file_writing_last_n_endreason_not_ok(
 
     # Initially Status should be "Dir exists and is writable"
     val = await caget(hdf5_test_prefix + ":Status", datatype=DBR_CHAR_STR)
-    assert val == "Dir exists and is writable"
+    assert val == "OK"
 
     await caput(hdf5_test_prefix + ":Capture", 1, wait=True, timeout=TIMEOUT)