Skip to content

Commit d483115

Browse files
committed
fix: updated test calls
1 parent f8cc981 commit d483115

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_StalledJobAgent.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ def sja(mocker):
2828
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.StalledJobAgent.rescheduleJobs", return_value=MagicMock())
2929
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.StalledJobAgent.PilotAgentsDB", return_value=MagicMock())
3030
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.StalledJobAgent.getJobParameters", return_value=MagicMock())
31+
mocker.patch("DIRAC.WorkloadManagementSystem.Agent.StalledJobAgent.kill_delete_jobs", return_value=MagicMock())
3132

3233
stalledJobAgent = StalledJobAgent()
3334
stalledJobAgent._AgentModule__configDefaults = mockAM

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,11 @@ def test_JobStateUpdateAndJobMonitoring() -> None:
289289
# forcing the update
290290
res = jobStateUpdateClient.setJobStatus(jobID, JobStatus.RUNNING, "running", "source", None, True)
291291
assert res["OK"], res["Message"]
292-
res = jobStateUpdateClient.setJobParameters(jobID, [("par1", "par1Value"), ("par2", "par2Value")])
292+
res = jobStateUpdateClient.setJobParameters(jobID, [("CPUNormalizationFactor", 10), ("HostName", "hlt123")])
293+
assert res["OK"], res["Message"]
294+
res = jobStateUpdateClient.setJobParameter(jobID, "Pilot_Reference", "https://pilot.reference.com/123456")
295+
assert res["OK"], res["Message"]
296+
res = jobStateUpdateClient.setJobAttribute(jobID, "ApplicationStatus", "some_app_status")
293297
assert res["OK"], res["Message"]
294298
res = jobStateUpdateClient.setJobApplicationStatus(jobID, "app status", "source")
295299
assert res["OK"], res["Message"]
@@ -303,38 +307,38 @@ def test_JobStateUpdateAndJobMonitoring() -> None:
303307

304308
time.sleep(3)
305309

306-
res = jobMonitoringClient.getJobParameters(jobID, ["par1", "par2"])
310+
res = jobMonitoringClient.getJobParameters(jobID, ["CPUNormalizationFactor", "HostName"])
307311
assert res["OK"], res["Message"]
308-
assert res["Value"] == {jobID: {"par1": "par1Value", "par2": "par2Value"}}
312+
assert res["Value"] == {jobID: {"CPUNormalizationFactor": 10, "HostName": "hlt123"}}
309313

310-
res = jobMonitoringClient.getJobParameter(jobID, "par1")
314+
res = jobMonitoringClient.getJobParameter(jobID, "Pilot_Reference")
311315
assert res["OK"], res["Message"]
312-
assert res["Value"] == {"par1": "par1Value"}
316+
assert res["Value"] == {"Pilot_Reference": "https://pilot.reference.com/123456"}
313317

314318
res = jobMonitoringClient.getJobParameters(jobID)
315319
assert res["OK"], res["Message"]
316320
assert jobID in res["Value"]
317-
assert "par1" in res["Value"][jobID]
318-
assert "par2" in res["Value"][jobID]
319-
assert res["Value"][jobID]["par1"] == "par1Value"
320-
assert res["Value"][jobID]["par2"] == "par2Value"
321+
assert "CPUNormalizationFactor" in res["Value"][jobID]
322+
assert "HostName" in res["Value"][jobID]
323+
assert res["Value"][jobID]["CPUNormalizationFactor"] == 10
324+
assert res["Value"][jobID]["HostName"] == "hlt123"
321325

322-
res = jobMonitoringClient.getJobParameters(jobID, "par1")
326+
res = jobMonitoringClient.getJobParameters(jobID, "Pilot_Reference")
323327
assert res["OK"], res["Message"]
324-
assert res["Value"] == {jobID: {"par1": "par1Value"}}
328+
assert res["Value"] == {jobID: {"Pilot_Reference": "https://pilot.reference.com/123456"}}
325329

326330
res = jobMonitoringClient.getJobAttribute(jobID, "Site")
327331
assert res["OK"], res["Message"]
328332
assert res["Value"] == "Site"
329333

330334
res = jobMonitoringClient.getJobAttributes(jobID)
331335
assert res["OK"], res["Message"]
332-
assert res["Value"]["ApplicationStatus"] == "app status"
336+
assert res["Value"]["ApplicationStatus"] == "some_app_status"
333337
assert res["Value"]["JobName"] == "helloWorld"
334338

335339
res = jobMonitoringClient.getJobSummary(jobID)
336340
assert res["OK"], res["Message"]
337-
assert res["Value"]["ApplicationStatus"] == "app status"
341+
assert res["Value"]["ApplicationStatus"] == "some_app_status"
338342
assert res["Value"]["Status"] == JobStatus.RUNNING
339343

340344
res = jobMonitoringClient.getJobHeartBeatData(jobID)
@@ -355,7 +359,7 @@ def test_JobStateUpdateAndJobMonitoring() -> None:
355359
assert res["OK"], res["Message"]
356360
assert res["Value"]["Status"] == JobStatus.DONE
357361
assert res["Value"]["MinorStatus"] == "MinorStatus"
358-
assert res["Value"]["ApplicationStatus"] == "app status"
362+
assert res["Value"]["ApplicationStatus"] == "some_app_status"
359363

360364
res = jobStateUpdateClient.sendHeartBeat(jobID, {"bih": "bih"}, {"boh": "boh"})
361365
assert res["OK"], res["Message"]

0 commit comments

Comments
 (0)