fix: remove deprecated

Author: fstagni

src/DIRAC/WorkloadManagementSystem/Client/JobState/CachedJobState.py

@@ -4,12 +4,13 @@
     everything locally instead of going to the DB.
 """
 import copy
-import time, datetime
+import datetime
+import time
 
+from DIRAC import S_ERROR, S_OK, gLogger
 from DIRAC.Core.Utilities import DEncode
-from DIRAC import S_OK, S_ERROR, gLogger
-from DIRAC.WorkloadManagementSystem.Client.JobState.JobState import JobState
 from DIRAC.WorkloadManagementSystem.Client.JobState.JobManifest import JobManifest
+from DIRAC.WorkloadManagementSystem.Client.JobState.JobState import JobState
 
 
 class CachedJobState:
@@ -288,9 +289,9 @@ def __addLogRecord(self, majorStatus=None, minorStatus=None, appStatus=None, sou
         if majorStatus:
             record["status"] = majorStatus
         if minorStatus:
-            record["minor"] = minorStatus
+            record["minorStatus"] = minorStatus
         if appStatus:
-            record["application"] = appStatus
+            record["applicationStatus"] = appStatus
         if not record:
             return
         if not source:

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -549,13 +549,6 @@ def test_JobStateUpdateAndJobMonitoringMultiple(lfn):
         }
         res = jobMonitoringClient.getMinorStates()
         assert res["OK"], res["Message"]
-        assert set(res["Value"]) <= {
-            "Assigned",
-            "Job accepted",
-            "Pilot Agent Submission",
-            JobMinorStatus.RESCHEDULED,
-            "Marked for termination",
-        }
 
         res = jobMonitoringClient.getJobs()
         assert res["OK"], res["Message"]

tests/Integration/all_integration_server_tests.sh

@@ -24,13 +24,12 @@ pytest --no-check-dirac-environment "${THIS_DIR}/Core/Test_ElasticsearchDB.py" |
 pytest --no-check-dirac-environment "${THIS_DIR}/Core/Test_MySQLDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
 #-------------------------------------------------------------------------------#
-echo -e "*** $(date -u) **** FRAMEWORK TESTS (partially skipped) ****\n"
+echo -e "*** $(date -u) **** FRAMEWORK TESTS ****\n"
 pytest --no-check-dirac-environment "${THIS_DIR}/Framework/Test_InstalledComponentsDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/Framework/Test_ProxyDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/Framework/Test_TokenDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/Framework/Test_AuthDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/Framework/Test_AuthServer.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
-#pytest --no-check-dirac-environment ${THIS_DIR}/Framework/Test_LoggingDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
 #-------------------------------------------------------------------------------#
 echo -e "*** $(date -u)  **** MONITORING TESTS ****\n"
@@ -50,7 +49,6 @@ pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_E
 pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_JobParameters_MySQLandES.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_PilotAgentsDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_SandboxMetadataDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
-pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_VirtualMachineDB.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 pytest --no-check-dirac-environment "${THIS_DIR}/WorkloadManagementSystem/Test_JobCleaningAgent.py" |& tee -a "${SERVER_TEST_OUTPUT}"; (( ERR |= "${?}" ))
 
 #-------------------------------------------------------------------------------#