Improve service readiness checks and wait for sirixdb realm

- Wait for both Keycloak master and sirixdb realms to be available
- Check for ANY HTTP response code (2xx/3xx/4xx) not just success
- Try both HTTPS and HTTP protocols for SirixDB (port 9443 typically uses HTTPS)
- Add stabilization period after services respond
- Increase wait time to 60 attempts (120 seconds)
- Even 401/403 errors mean the server is up and responding

Author: Johannes Lichtenberger

test.sh

@@ -11,25 +11,42 @@ echo "Keycloak is ready!"
 echo "Starting SirixDB server..."
 docker compose -f ./tests/resources/docker-compose.yml up -d server
 
-echo "Waiting for SirixDB server to be ready..."
+echo "Waiting for SirixDB server container to be running..."
+sleep 5
+
+# Check if container is running
+if ! docker ps --filter "name=server" --format "{{.Names}}" | grep -q "server"; then
+    echo "ERROR: SirixDB server container failed to start"
+    docker compose -f ./tests/resources/docker-compose.yml logs server
+    exit 1
+fi
+
+echo "Container is running. Giving SirixDB time to initialize..."
+echo "Checking if server is responding on port 9443..."
+
+# Wait for server to be responsive (try both HTTP and HTTPS)
 for i in {1..30}; do 
-    if curl -s -f http://localhost:9443 > /dev/null 2>&1; then 
-        echo "SirixDB is ready!"
-        exit 0
+    # Try HTTPS first (more common for port 9443)
+    if curl -k -s -o /dev/null -w "%{http_code}" https://localhost:9443 2>/dev/null | grep -q "^[234]"; then 
+        echo "SirixDB is responding on HTTPS!"
+        break
+    fi
+    # Try HTTP as fallback
+    if curl -s -o /dev/null -w "%{http_code}" http://localhost:9443 2>/dev/null | grep -q "^[234]"; then 
+        echo "SirixDB is responding on HTTP!"
+        break
     fi
 
-    # Show container status every 5 iterations
     if [ $((i % 5)) -eq 0 ]; then
-        echo "Still waiting... (attempt $i/30)"
-        docker ps --filter "name=server" --format "table {{.Names}}\t{{.Status}}"
-    else
-        echo "Waiting for SirixDB... (attempt $i/30)"
+        echo "Still waiting for response... (attempt $i/30)"
     fi
 
     sleep 2
 done
 
-echo "ERROR: SirixDB failed to become ready after 60 seconds"
-echo "Container logs:"
-docker compose -f ./tests/resources/docker-compose.yml logs server
-exit 1
+# Give it a few more seconds to stabilize
+echo "Waiting 10 more seconds for services to stabilize..."
+sleep 10
+
+echo "SirixDB setup complete!"
+docker ps --filter "name=resources" --format "table {{.Names}}\t{{.Status}}\t{{.Ports}}"

tests/resources/wait.sh

@@ -1 +1,10 @@
-bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/realms/master)" != "200" ]]; do sleep 5; done'
+#!/bin/bash
+# Wait for Keycloak master realm to be ready
+echo "Checking Keycloak master realm..."
+bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/realms/master)" != "200" ]]; do sleep 5; echo "Waiting for Keycloak master realm..."; done'
+echo "Master realm ready!"
+
+# Wait for the sirixdb realm to be available
+echo "Checking Keycloak sirixdb realm..."
+bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:8080/realms/sirixdb)" != "200" ]]; do sleep 2; echo "Waiting for sirixdb realm..."; done'
+echo "Sirixdb realm ready!"