|
6 | 6 |
|
7 | 7 | """ |
8 | 8 |
|
| 9 | +import datetime |
| 10 | +import json |
9 | 11 | import os |
10 | | -import time |
11 | 12 | import random |
12 | | -import json |
13 | | -import datetime |
| 13 | +import time |
14 | 14 | from functools import cached_property |
15 | 15 |
|
16 | 16 | # # from DIRAC |
17 | | -from DIRAC import gLogger, S_OK, S_ERROR |
18 | | -from DIRAC.Core.Utilities.List import randomize, fromChar |
19 | | -from DIRAC.Core.Utilities.JEncode import strToIntDict |
| 17 | +from DIRAC import S_ERROR, S_OK, gLogger |
| 18 | +from DIRAC.ConfigurationSystem.Client import PathFinder |
| 19 | +from DIRAC.Core.Base.Client import Client, createClient |
20 | 20 | from DIRAC.Core.Utilities.DEncode import ignoreEncodeWarning |
| 21 | +from DIRAC.Core.Utilities.JEncode import strToIntDict |
| 22 | +from DIRAC.Core.Utilities.List import fromChar, randomize |
21 | 23 | from DIRAC.Core.Utilities.ObjectLoader import ObjectLoader |
22 | 24 | from DIRAC.Core.Utilities.ReturnValues import returnValueOrRaise |
23 | | -from DIRAC.ConfigurationSystem.Client import PathFinder |
24 | | -from DIRAC.Core.Base.Client import Client, createClient |
25 | 25 | from DIRAC.RequestManagementSystem.Client.Request import Request |
26 | 26 | from DIRAC.RequestManagementSystem.private.RequestValidator import RequestValidator |
27 | | -from DIRAC.WorkloadManagementSystem.Client import JobStatus |
28 | | -from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus |
| 27 | +from DIRAC.WorkloadManagementSystem.Client import JobMinorStatus, JobStatus |
29 | 28 | from DIRAC.WorkloadManagementSystem.Client.JobMonitoringClient import JobMonitoringClient |
30 | 29 | from DIRAC.WorkloadManagementSystem.Client.JobStateUpdateClient import JobStateUpdateClient |
31 | 30 | from DIRAC.WorkloadManagementSystem.Utilities.JobStatusUtility import JobStatusUtility |
@@ -718,7 +717,7 @@ def setJobStatus(self, jobID: int, newStatus: str, minorStatus: str, source: str |
718 | 717 | int(jobID), status=newStatus, minorStatus=minorStatus, source=source |
719 | 718 | ) |
720 | 719 | else: |
721 | | - return self._client.setJobStatus(jobID, minorStatus, minorStatus, source) |
| 720 | + return self._client.setJobStatus(jobID, newStatus, minorStatus, source) |
722 | 721 |
|
723 | 722 | def setJobApplicationStatus(self, jobID: int, appStatus: str, source: str): |
724 | 723 | if self._useCertificates: |
|
0 commit comments