From 4b9f670ca29389a42b072ddc72d4083168453761 Mon Sep 17 00:00:00 2001
From: Ygal Blum <ygal.blum@gmail.com>
Date: Fri, 21 Jul 2023 11:05:24 +0300
Subject: [PATCH] Quadlet system test - force journald log driver for short
 lived containers

When the test expects the container to exit, force using journald in
order to find its startup logs

Signed-off-by: Ygal Blum <ygal.blum@gmail.com>
---
 test/system/252-quadlet.bats | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/system/252-quadlet.bats b/test/system/252-quadlet.bats
index 508df59b12..7b824be00a 100644
--- a/test/system/252-quadlet.bats
+++ b/test/system/252-quadlet.bats
@@ -873,15 +873,13 @@ spec:
     - name: $container_name
       image: $IMAGE
       command:
-      - "sh"
-      args:
-      - "-c"
-      - "echo STARTED CONTAINER; $cmd"
+      - $cmd
 EOF
        cat > $quadlet_file <<EOF
 [Kube]
 Yaml=$yaml_file
 ExitCodePropagation=$exit_code_prop
+LogDriver=journald
 EOF
 
       run_quadlet "$quadlet_file"
@@ -892,8 +890,9 @@ EOF
 
       service_setup $QUADLET_SERVICE_NAME
 
-      # Ensure we have output.
-      wait_for_output "STARTED CONTAINER" $pod_name-$container_name
+      # Ensure we have output. Output is synced via sd-notify (socat in Exec)
+      run journalctl "--since=$STARTED_TIME" --unit="$QUADLET_SERVICE_NAME"
+      is "$output" '.*Started.*\.service.*'
 
       # Opportunistic test: confirm that the Propagation field got set.
       # This is racy, because the container is short-lived and quadlet