chore: improve UploadLogFile tests

Author: AcquaDiGiorgio

test/test_commands.py

@@ -29,6 +29,15 @@ def basedir(self):
 
             yield tmpdir
 
+    def test_correct_file_finding(self, basedir):
+        """Test output file finding."""
+        from dirac_cwl_proto.commands.upload_log_file import obtain_output_files
+
+        files = obtain_output_files(basedir)
+        files_names = [os.path.basename(file_path) for file_path in files]
+
+        assert set(self.FILENAMES).difference(files_names) == {"file.extra"}
+
     def test_upload_ok(self, basedir, mocker: MockerFixture):
         """Test a correct upload."""
         base_lfn = f"/lhcb/{self.NAMESPACE}/{self.CONFIG_VERSION}/LOG/{self.PRODUCTION_ID.zfill(8)}/0000/"
@@ -85,11 +94,12 @@ def test_upload_ok_to_failover(self, basedir, mocker: MockerFixture):
         assert result["OK"]
 
     def test_upload_fail(self, basedir, mocker: MockerFixture):
-        """Test both a failure to LogSE and the FailoverSE."""
+        """Test both a failure to upload to the LogSE and the FailoverSE."""
         base_lfn = f"/lhcb/{self.NAMESPACE}/{self.CONFIG_VERSION}/LOG/{self.PRODUCTION_ID.zfill(8)}/0000/"
         zip_name = self.JOB_ID.zfill(8) + ".zip"
 
         expected_lfn = os.path.join(base_lfn, zip_name)
+        expected_zip = os.path.join(basedir, zip_name)
 
         mock_put = mocker.patch("dirac_cwl_proto.data_management_mocks.data_manager.MockDataManager.put")
         mock_putAndRegister = mocker.patch(
@@ -107,6 +117,8 @@ def test_upload_fail(self, basedir, mocker: MockerFixture):
             config_version=self.CONFIG_VERSION,
         )
 
+        mock_put.assert_called_once_with(expected_lfn, expected_zip, "LogSE")
+        mock_putAndRegister.assert_called_once_with(expected_lfn, expected_zip, "Tier1-Failover")
         assert not result["OK"]
 
     # TO TEST: Failed to zip files - No outputs generated by the job