Merge pull request #7925 from fstagni/90_fixes11

[9.0] Test fixes

Author: fstagni

tests/CI/docker-compose.yml

@@ -15,7 +15,7 @@ services:
     ports:
       - 3306:3306
     healthcheck:
-      test: ["CMD", "${MYSQL_ADMIN_COMMAND}", "ping", "-h", "localhost"]
+      test: ["CMD", "sh", "-c", "${MYSQL_ADMIN_COMMAND} ping -h localhost > /tmp/health.log 2>&1;"]
       timeout: 20s
       retries: 10
       start_period: 60s
@@ -115,7 +115,7 @@ services:
       s3-direct:
         condition: service_started
       iam-login-service:
-        condition: service_started
+        condition: service_healthy
       diracx-init-key:
         condition: service_completed_successfully # Let the init container create the signing key
       diracx-init-cs:
@@ -161,7 +161,7 @@ services:
       nofile: 8192
     pull_policy: always
     healthcheck:
-      test: ["CMD", "ls", "${CVMFS_DIR}"]
+      test: ["CMD", "ls ${CVMFS_DIR} > /tmp/health.log 2>&1;"]
       timeout: 20s
       retries: 10
       start_period: 60s

tests/Integration/WorkloadManagementSystem/Test_JobLoggingDB.py

@@ -20,7 +20,7 @@ def fixtureJobLoggingDB():
 
 def test_JobStatus(jobLoggingDB: JobLoggingDB):
     result = jobLoggingDB.addLoggingRecord(
-        1,
+        1000,
         status="testing",
         minorStatus="date=datetime.datetime.utcnow()",
         date=datetime.datetime.utcnow(),
@@ -30,37 +30,37 @@ def test_JobStatus(jobLoggingDB: JobLoggingDB):
 
     date = "2006-04-25 14:20:17"
     result = jobLoggingDB.addLoggingRecord(
-        1, status="testing", minorStatus="2006-04-25 14:20:17", date=date, source="Unittest"
+        1000, status="testing", minorStatus="2006-04-25 14:20:17", date=date, source="Unittest"
     )
     assert result["OK"] is True, result["Message"]
 
-    result = jobLoggingDB.addLoggingRecord(1, status="testing", minorStatus="No date 1", source="Unittest")
+    result = jobLoggingDB.addLoggingRecord(1000, status="testing", minorStatus="No date 1", source="Unittest")
     assert result["OK"] is True, result["Message"]
 
-    result = jobLoggingDB.addLoggingRecord(1, status="testing", minorStatus="No date 2", source="Unittest")
+    result = jobLoggingDB.addLoggingRecord(1000, status="testing", minorStatus="No date 2", source="Unittest")
     assert result["OK"] is True, result["Message"]
 
-    result = jobLoggingDB.getJobLoggingInfo(1)
+    result = jobLoggingDB.getJobLoggingInfo(1000)
     assert result["OK"] is True, result["Message"]
 
-    result = jobLoggingDB.getWMSTimeStamps(1)
+    result = jobLoggingDB.getWMSTimeStamps(1000)
     assert result["OK"] is True, result["Message"]
 
     now = datetime.datetime.utcnow()
     result = jobLoggingDB.addLoggingRecord(
-        [2, 3, 4, 5],
+        [1001, 1002, 1003, 1004],
         status=["testing", "testing", "testing", "testing"],
         minorStatus=["mn", "mn", "mn", "mn"],
         date=[now, now, now, now],
         source="Unittest",
     )
     assert result["OK"] is True, result["Message"]
 
-    result = jobLoggingDB.getJobLoggingInfo(2)
+    result = jobLoggingDB.getJobLoggingInfo(1001)
     assert result["OK"] is True, result["Message"]
     assert result["Value"][-1][0:3] == ("testing", "mn", "Unknown")
 
-    result = jobLoggingDB.getJobLoggingInfo(5)
+    result = jobLoggingDB.getJobLoggingInfo(1004)
     assert result["OK"] is True, result["Message"]
     assert result["Value"][-1][0:3] == ("testing", "mn", "Unknown")