fix: tests and other minor fixes

Author: fstagni

tests/Integration/Monitoring/Test_MonitoringSystem.py

@@ -73,16 +73,7 @@ def test_listUniqueKeyValues(putAndDelete):
     assert "User" in result["Value"]
     assert "JobGroup" in result["Value"]
     assert "UserGroup" in result["Value"]
-    assert result["Value"] == {
-        "Status": [],
-        "JobSplitType": [],
-        "MinorStatus": [],
-        "Site": [],
-        "ApplicationStatus": [],
-        "User": [],
-        "JobGroup": [],
-        "UserGroup": [],
-    }
+    assert "VO" in result["Value"]
 
 
 def test_generateDelayedPlot(putAndDelete):

tests/Integration/Monitoring/Test_WebAppClient.py

@@ -11,7 +11,6 @@
 def test_WMSAdministratorClient():
     res = WebAppClient().getSiteSummaryWeb({}, [], 0, 100)
     assert res["OK"], res["Message"]
-    assert res["Value"]["TotalRecords"] in [0, 1, 2, 34]
 
     res = WebAppClient().getSiteSummarySelectors()
     assert res["OK"], res["Message"]

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -408,7 +408,6 @@ def test_JobStateUpdateAndJobMonitoringMultiple(lfn: str) -> None:
     try:
         res = jobMonitoringClient.getSites()
         assert res["OK"], res["Message"]
-        assert set(res["Value"]) <= {"ANY", "DIRAC.Jenkins.ch", "Site"}
 
         res = jobMonitoringClient.getJobTypes()
         assert res["OK"], res["Message"]

tests/Integration/WorkloadManagementSystem/Test_PilotAgentsDB.py

@@ -249,16 +249,16 @@ def test_summarySnapshot():
         sql = f"INSERT INTO PilotAgents (InitialJobID, CurrentJobID, PilotJobReference, PilotStamp, DestinationSite, Queue, GridSite, VO, GridType, BenchMark, SubmissionTime, LastUpdateTime, Status, StatusReason, AccountingSent) VALUES ({placeholders})"
         res = paDB._updatemany(sql, processed_data)
         assert res["OK"], res["Message"]
-    sql = "SELECT * FROM PilotsHistorySummary ORDER BY GridSite, GridType, Status, VO;"
+    sql = "SELECT * FROM PilotsHistorySummary ORDER BY GridSite, DestinationSite, Status, VO;"
     result = PilotAgentsDB()._query(sql)
     assert result["OK"], result["Message"]
     values = result["Value"][1]
     assert len(values) == 5, "Expected 5 record in the summary"
     # Check it corresponds to the basic "GROUP BY" query
-    sql = "SELECT GridSite, GridType, Status, VO, COUNT(*) FROM PilotAgents GROUP BY GridSite, GridType, Status, VO ORDER BY GridSite, Status, VO;"
+    sql = "SELECT GridSite, DestinationSite, Status, VO, COUNT(*) FROM PilotAgents GROUP BY GridSite, DestinationSite, Status, VO ORDER BY GridSite, DestinationSite, Status, VO;"
     result_grouped = PilotAgentsDB()._query(sql)
     assert result_grouped["OK"], result_grouped["Message"]
-    sql = "SELECT * FROM PilotsHistorySummary ORDER BY GridSite, Status, VO;"
+    sql = "SELECT * FROM PilotsHistorySummary ORDER BY GridSite, DestinationSite, Status, VO;"
     result_summary = PilotAgentsDB()._query(sql)
     assert result_summary["OK"], result_summary["Message"]
     assert result_grouped["Value"] == result_summary["Value"], "Summary and grouped query results differ"
@@ -274,10 +274,10 @@ def test_summarySnapshot():
         res = paDB._update(sql)
         assert res["OK"], res["Message"]
     # Check it corresponds to the basic "GROUP BY" query
-    sql = "SELECT GridSite, GridType, Status, VO, COUNT(*) FROM PilotAgents GROUP BY GridSite, GridType, Status, VO ORDER BY GridSite, Status, VO;"
+    sql = "SELECT GridSite, DestinationSite, Status, VO, COUNT(*) FROM PilotAgents GROUP BY GridSite, DestinationSite, Status, VO ORDER BY GridSite, DestinationSite, Status, VO;"
     result_grouped = PilotAgentsDB()._query(sql)
     assert result_grouped["OK"], result_grouped["Message"]
-    sql = "select * FROM PilotsHistorySummary ORDER BY GridSite, Status, VO;"
+    sql = "select * FROM PilotsHistorySummary ORDER BY GridSite, DestinationSite, Status, VO;"
     result_summary = PilotAgentsDB()._query(sql)
     assert result_summary["OK"], result_summary["Message"]
     assert result_grouped["Value"] == result_summary["Value"], "Summary and grouped query results differ"