Tests failed as regex wrong

Author: stephen-riggs

src/cryoemservices/services/denoise.py

@@ -333,7 +333,7 @@ def denoise(self, rw, header: dict, message: dict):
             # Take file name for Relion-type projects, or folder name for SXT-style
             tomo_name = (
                 denoised_full_path.name
-                if re.match("/job[0-9]+/", str(denoised_full_path))
+                if re.match(".*/job[0-9]+/.*", str(denoised_full_path))
                 else f"{denoised_full_path.parent.parent}_denoised.mrc"
             )
             shutil.copy(

src/cryoemservices/services/membrain_seg.py

@@ -274,7 +274,7 @@ def membrain_seg(self, rw, header: dict, message: dict):
             # Take file name for Relion-type projects, or folder name for SXT-style
             tomo_name = (
                 segmented_path.name
-                if re.match("/job[0-9]+/", str(segmented_path))
+                if re.match(".*/job[0-9]+/.*", str(segmented_path))
                 else f"{segmented_path.parent.parent}_segmented.mrc"
             )
             shutil.copy(segmented_path, segmented_path.parent.parent.parent / tomo_name)

src/cryoemservices/services/tomo_align_aretomo.py

@@ -860,12 +860,12 @@ def _tilt(file_list_for_tilts):
             # Take file name for Relion-type projects, or folder name for SXT-style
             stack_name = (
                 Path(tomo_params.stack_file).name
-                if re.match("job[0-9]+", tomo_params.stack_file)
+                if re.match(".*/job[0-9]+/.*", tomo_params.stack_file)
                 else f"{Path(tomo_params.stack_file).parent.parent}_stack.mrc"
             )
             tomo_name = (
                 aretomo_output_path.name
-                if re.match("job[0-9]+", str(aretomo_output_path))
+                if re.match(".*/job[0-9]+/.*", str(aretomo_output_path))
                 else f"{aretomo_output_path.parent.parent}_volume.mrc"
             )
             shutil.copy(Path(tomo_params.stack_file), project_dir.parent / stack_name)