fix: minor fix on deletion delay

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Agent/JobCleaningAgent.py

@@ -103,8 +103,6 @@ def _getAllowedJobTypes(self):
     def execute(self):
         """Remove or delete jobs in various status"""
 
-        # TODO: check the WMS SM before calling the functions below (v7r3)
-
         # First, fully remove jobs in JobStatus.DELETED state
         result = self.removeDeletedJobs()
         if not result["OK"]:
@@ -143,14 +141,13 @@ def execute(self):
 
         return S_OK()
 
-    def removeDeletedJobs(self, delay=False):
+    def removeDeletedJobs(self):
         """Fully remove jobs that are already in status "DELETED", unless there are still requests.
 
-        :param int delay: days of delay
         :returns: S_OK/S_ERROR
         """
 
-        res = self._getJobsList({"Status": JobStatus.DELETED}, delay)
+        res = self._getJobsList({"Status": JobStatus.DELETED})
         if not res["OK"]:
             return res
         jobList = res["Value"]
@@ -270,7 +267,7 @@ def _getJobsList(self, condDict, delay=None):
         :returns: S_OK with jobsList
         """
         jobIDsS = set()
-        delayStr = "and older than %s day(s)" % delay if delay else ""
+        delayStr = "and older than %s" % delay if delay else ""
         self.log.info("Get jobs with %s %s" % (str(condDict), delayStr))
         for order in ["JobID:ASC", "JobID:DESC"]:
             result = self.jobDB.selectJobs(condDict, older=delay, orderAttribute=order, limit=self.maxJobsAtOnce)
@@ -282,8 +279,9 @@ def _getJobsList(self, condDict, delay=None):
 
     def _getOwnerJobsDict(self, jobList):
         """
-        gets in input a list of int(JobID) and return a dict with a grouping of them by owner, e.g.
-        {'dn;group': [1, 3, 4], 'dn;group_1': [5], 'dn_1;group': [2]}
+        :param list jobList: list of int(JobID)
+
+        :returns: a dict with a grouping of them by owner, e.g.{'dn;group': [1, 3, 4], 'dn;group_1': [5], 'dn_1;group': [2]}
         """
         res = self.jobDB.getJobsAttributes(jobList, ["OwnerDN", "OwnerGroup"])
         if not res["OK"]: