fix: add a sleep to let the test pass

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Utilities/jobAdministration.py

@@ -5,8 +5,7 @@
 from DIRAC.WorkloadManagementSystem.DB.JobDB import JobDB
 from DIRAC.WorkloadManagementSystem.DB.PilotAgentsDB import PilotAgentsDB
 from DIRAC.WorkloadManagementSystem.DB.TaskQueueDB import TaskQueueDB
-from DIRAC.WorkloadManagementSystem.Service.JobPolicy import RIGHT_KILL
-
+from DIRAC.WorkloadManagementSystem.Service.JobPolicy import RIGHT_KILL, RIGHT_DELETE
 
 def _deleteJob(jobID, force=False):
     """Set the job status to "Deleted"
@@ -85,19 +84,13 @@ def kill_delete_jobs(right, validJobList, nonauthJobList=[], force=False):
             return filterRes
         killJobList.extend(filterRes["Value"])
 
-        if not right == RIGHT_KILL:
+        if right == RIGHT_DELETE:
             # Get the jobs allowed to transition to the Deleted state
             filterRes = filterJobStateTransition(validJobList, JobStatus.DELETED)
             if not filterRes["OK"]:
                 return filterRes
             deleteJobList.extend(filterRes["Value"])
 
-        # Look for jobs that are in the Staging state to send kill signal to the stager
-        result = JobDB().getJobsAttributes(killJobList, ["Status"])
-        if not result["OK"]:
-            return result
-        stagingJobList = [jobID for jobID, sDict in result["Value"].items() if sDict["Status"] == JobStatus.STAGING]
-
         for jobID in killJobList:
             result = _killJob(jobID, force=force)
             if not result["OK"]:
@@ -108,6 +101,12 @@ def kill_delete_jobs(right, validJobList, nonauthJobList=[], force=False):
             if not result["OK"]:
                 badIDs.append(jobID)
 
+        # Look for jobs that are in the Staging state to send kill signal to the stager
+        result = JobDB().getJobsAttributes(killJobList, ["Status"])
+        if not result["OK"]:
+            return result
+        stagingJobList = [jobID for jobID, sDict in result["Value"].items() if sDict["Status"] == JobStatus.STAGING]
+
         if stagingJobList:
             stagerDB = StorageManagementDB()
             gLogger.info("Going to send killing signal to stager as well!")

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -505,6 +505,7 @@ def test_JobStateUpdateAndJobMonitoringMultiple(lfn: str) -> None:
     finally:
         res = jobManagerClient.killJob(jobIDs)
         assert res["OK"], res["Message"]
+        time.sleep(5)
         res = jobManagerClient.deleteJob(jobIDs)
         assert res["OK"], res["Message"]
         res = jobManagerClient.removeJob(jobIDs)