chore: Update project name at imports

Author: AcquaDiGiorgio

src/dirac_cwl/commands/upload_log_file.py

@@ -18,7 +18,7 @@
 from DIRAC.Resources.Storage.StorageElement import StorageElement
 from DIRAC.WorkloadManagementSystem.Client.JobReport import JobReport
 
-from dirac_cwl_proto.commands import PostProcessCommand
+from dirac_cwl.commands import PostProcessCommand
 
 
 class UploadLogFile(PostProcessCommand):
@@ -80,7 +80,9 @@ def execute(self, job_path, **kwargs):
             logHttpsURL = urljoin("https://lhcb-dirac-logse.web.cern.ch/lhcb-dirac-logse/", zip_lfn)
         else:
             logHttpsURL = result["Value"]
-        job_report.setJobParameter("Log URL", f'<a href="{logHttpsURL.replace('.zip','/')}">Log file directory</a>')
+
+        logHttpsURL = logHttpsURL.replace('.zip','/')
+        job_report.setJobParameter("Log URL", f'<a href="{logHttpsURL}">Log file directory</a>')
 
         return S_OK("Log Files uploaded")
 

test/test_commands.py

@@ -8,7 +8,7 @@
 from DIRACCommon.Core.Utilities.ReturnValues import S_ERROR, S_OK
 from pytest_mock import MockerFixture
 
-from dirac_cwl_proto.commands import UploadLogFile
+from dirac_cwl.commands import UploadLogFile
 
 
 class TestUploadLogFile:
@@ -54,18 +54,18 @@ def test_upload_ok(self, basedir, mocker: MockerFixture):
         expected_path = os.path.join(basedir, zip_name)
 
         # Mock Operations
-        mock_ops = mocker.patch("dirac_cwl_proto.commands.upload_log_file.Operations")
+        mock_ops = mocker.patch("dirac_cwl.commands.upload_log_file.Operations")
         mock_ops.return_value.getValue = lambda value, default=None: default
 
         # Mock JobReport
-        mock_job_report = mocker.patch("dirac_cwl_proto.commands.upload_log_file.JobReport")
+        mock_job_report = mocker.patch("dirac_cwl.commands.upload_log_file.JobReport")
         mock_set_app_status = mocker.MagicMock()
         mock_set_job_parameter = mocker.MagicMock()
         mock_job_report.return_value.setApplicationStatus = mock_set_app_status
         mock_job_report.return_value.setJobParameter = mock_set_job_parameter
 
         # Mock StorageElement
-        mock_se = mocker.patch("dirac_cwl_proto.commands.upload_log_file.StorageElement")
+        mock_se = mocker.patch("dirac_cwl.commands.upload_log_file.StorageElement")
         mock_put_file = mocker.MagicMock()
         mock_get_url = mocker.MagicMock()
         mock_put_file.return_value = S_OK({"Successful": {expected_lfn: "Borked"}, "Failed": {}})
@@ -103,18 +103,18 @@ def test_upload_ok_to_failover(self, basedir, mocker: MockerFixture):
         expected_path = os.path.join(basedir, zip_name)
 
         # Mock Operations
-        mock_ops = mocker.patch("dirac_cwl_proto.commands.upload_log_file.Operations")
+        mock_ops = mocker.patch("dirac_cwl.commands.upload_log_file.Operations")
         mock_ops.return_value.getValue = lambda value, default=None: default
 
         # Mock JobReport
-        mock_job_report = mocker.patch("dirac_cwl_proto.commands.upload_log_file.JobReport")
+        mock_job_report = mocker.patch("dirac_cwl.commands.upload_log_file.JobReport")
         mock_set_app_status = mocker.MagicMock()
         mock_set_job_parameter = mocker.MagicMock()
         mock_job_report.return_value.setApplicationStatus = mock_set_app_status
         mock_job_report.return_value.setJobParameter = mock_set_job_parameter
 
         # Mock StorageElement
-        mock_se = mocker.patch("dirac_cwl_proto.commands.upload_log_file.StorageElement")
+        mock_se = mocker.patch("dirac_cwl.commands.upload_log_file.StorageElement")
         mock_put_file = mocker.MagicMock()
         mock_get_url = mocker.MagicMock()
         mock_put_file.return_value = S_OK({"Successful": {}, "Failed": {expected_lfn: "Borked"}})
@@ -152,14 +152,14 @@ def test_upload_fail(self, basedir, mocker: MockerFixture):
         expected_path = os.path.join(basedir, zip_name)
 
         # Mock JobReport
-        mock_job_report = mocker.patch("dirac_cwl_proto.commands.upload_log_file.JobReport")
+        mock_job_report = mocker.patch("dirac_cwl.commands.upload_log_file.JobReport")
         mock_set_app_status = mocker.MagicMock()
         mock_set_job_parameter = mocker.MagicMock()
         mock_job_report.return_value.setApplicationStatus = mock_set_app_status
         mock_job_report.return_value.setJobParameter = mock_set_job_parameter
 
         # Mock StorageElement
-        mock_se = mocker.patch("dirac_cwl_proto.commands.upload_log_file.StorageElement")
+        mock_se = mocker.patch("dirac_cwl.commands.upload_log_file.StorageElement")
         mock_put_file = mocker.MagicMock()
         mock_get_url = mocker.MagicMock()
         mock_put_file.return_value = S_OK({"Successful": {}, "Failed": {expected_lfn: "Borked"}})
@@ -195,7 +195,7 @@ def test_no_files_to_zip(self, basedir, mocker):
         shutil.rmtree(basedir)
 
         # Mock JobReport
-        mock_job_report = mocker.patch("dirac_cwl_proto.commands.upload_log_file.JobReport")
+        mock_job_report = mocker.patch("dirac_cwl.commands.upload_log_file.JobReport")
         mock_set_app_status = mocker.MagicMock()
         mock_set_job_parameter = mocker.MagicMock()
         mock_job_report.return_value.setApplicationStatus = mock_set_app_status
@@ -222,7 +222,7 @@ def test_failed_to_zip(self, basedir, mocker: MockerFixture):
         mock_zip.side_effect = [AttributeError(), OSError(), ValueError()]
 
         # Mock JobReport
-        mock_job_report = mocker.patch("dirac_cwl_proto.commands.upload_log_file.JobReport")
+        mock_job_report = mocker.patch("dirac_cwl.commands.upload_log_file.JobReport")
         mock_set_app_status = mocker.MagicMock()
         mock_set_job_parameter = mocker.MagicMock()
         mock_job_report.return_value.setApplicationStatus = mock_set_app_status