Task #10339: bug & test fix

LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/lib/ingestjobmanagementserver.py

@@ -742,7 +742,7 @@ class IngestJobManager:
         return self.getJobAdminDicts(job_group_id=job_group_id, status=[JobFailed, JobProduced, JobRemoved])
 
     def getNotDoneJobAdminDicts(self, job_group_id=None):
-        return self.getJobAdminDicts(job_group_id=job_group_id, status=[JobToDo, JobScheduled, JobRetry])
+        return self.getJobAdminDicts(job_group_id=job_group_id, status=[JobToDo, JobScheduled, JobProducing, JobRetry])
 
     def getJobAdminDicts(self, job_group_id=None, status=None):
         with self.__lock:

LTA/LTAIngest/LTAIngestServer/LTAIngestAdminServer/test/t_ingestjobmanagementserver.py

@@ -101,19 +101,19 @@ try:
             t.daemon = True
             t.start()
 
-            with JobsMonitor() as  monitor:
 
-                assert manager.nrOfUnfinishedJobs() == 3, 'expected 3 jobs unfinished'
+            with JobsMonitor() as  monitor:
+                assert manager.nrOfUnfinishedJobs() == 3, 'expected 3 jobs unfinished before any job was started'
 
                 #mimick receiving and transferring of jobs
                 #check the status of the manager for correctness
                 job1 = receiveJob()
                 assert job1['JobId'] == 'A_999999999_777777777_L888888888_SB000_uv.MS', 'unexpected job %s' % job1['JobId']
                 sendNotification('JobStarted', job1['JobId'])
-                assert manager.nrOfUnfinishedJobs() == 3, 'expected 3 jobs unfinished'
+                assert manager.nrOfUnfinishedJobs() == 3, 'expected 3 jobs unfinished after 1st job was started'
 
                 sendNotification('JobProgress', job1['JobId'], percentage_done=25)
-                assert manager.nrOfUnfinishedJobs() == 3
+                assert manager.nrOfUnfinishedJobs() == 3, 'expected 3 jobs unfinished after 1st job made progress'
 
                 #just finish normally
                 sendNotification('JobFinished', job1['JobId'])