fix: Fixed ClientWMS test and reversed TEST_DIRACX flag

Author: Robin-Van-de-Merghel

.github/workflows/integration.yml

@@ -38,7 +38,7 @@ jobs:
           - TEST_NAME: "Backward Compatibility"
             ARGS: CLIENT_INSTALLATION_BRANCH=rel-v8r0 PILOT_INSTALLATION_BRANCH=rel-v8r0
           - TEST_NAME: "NoTestDIRACX"
-            ARGS: TEST_DIRACX=No
+            ARGS: TEST_DIRACX=Yes
 
     steps:
     - uses: actions/checkout@v4

integration_tests.py

@@ -30,7 +30,7 @@
     "DIRACOSVER": "master",
     "DIRACOS_TARBALL_PATH": None,
     "TEST_HTTPS": "No",
-    "TEST_DIRACX": "Yes",
+    "TEST_DIRACX": "No",
     "DIRAC_FEWER_CFG_LOCKS": None,
     "DIRAC_USE_JSON_ENCODE": None,
     "INSTALLATION_BRANCH": "",

src/DIRAC/WorkloadManagementSystem/FutureClient/JobStateUpdateClient.py

@@ -77,11 +77,11 @@ def setJobApplicationStatus(self, jobID: str | int, appStatus: str, source: str
     def setJobAttribute(self, jobID: str | int, attribute: str, value: str):
         with DiracXClient() as api:
             if attribute == "Status":
-                api.jobs.set_job_statuses(
+                return api.jobs.set_job_statuses(
                     {jobID: {datetime.now(tz=timezone.utc): {"Status": value}}},
                 )
             else:
-                api.jobs.patch_metadata({jobID: {attribute: value}})
+                return api.jobs.patch_metadata({jobID: {attribute: value}})
 
     @stripValueIfOK
     @convertToReturnValue

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -449,7 +449,8 @@ def test_JobStateUpdateAndJobMonitoringMultiple(lfn: str) -> None:
 
         res = jobMonitoringClient.getJobSummary(int(jobID))
         assert res["OK"], res["Message"]
-        assert res["Value"]["Status"] == JobStatus.RUNNING
+        assert res["Value"]["Status"] != JobStatus.RUNNING  # NOT equal: timedelta = 0 compared to above
+        assert res["Value"]["Status"] == JobStatus.MATCHED  # Keep previous result
     finally:
         res = jobManagerClient.killJob(jobIDs)
         assert res["OK"], res["Message"]