From 5908999e6d77577b050bc596ab64d16a5eabafed Mon Sep 17 00:00:00 2001
From: Ed Santiago <santiago@redhat.com>
Date: Wed, 9 Aug 2023 17:42:36 -0600
Subject: [PATCH] New partial-line test is flaking

...possibly because we somehow ended up with a two-line
log file for a simple 'echo hi'? Make our timestamp-getting
code safer by adding 'head -1'.

Signed-off-by: Ed Santiago <santiago@redhat.com>
---
 test/system/035-logs.bats | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index a606b772e2..9868d4e3cf 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -398,16 +398,21 @@ $content--2.*" "logs --until -f on running container works"
     # Hand-craft a log file with partial lines and carriage returns
     run_podman inspect --format '{{.HostConfig.LogConfig.Path}}' $cname
     logpath="$output"
-    timestamp=$(awk '{print $1}' <"$logpath")
+    timestamp=$(head -n1 "$logpath" | awk '{print $1}')
     cr=$'\r'
     nl=$'\n'
-    cat >| $logpath <<EOF
+    # Delete, don't overwrite, in case conmon still has the fd open
+    rm -f $logpath
+    cat > $logpath <<EOF
 $timestamp stdout F podman1$cr
 $timestamp stdout P podman2
 $timestamp stdout F $cr
 $timestamp stdout F podman3$cr
 EOF
 
+    # FIXME: remove after 2024-01-01 if no more flakes seen.
+    cat -vET $logpath
+
     expect1="podman3${cr}"
     expect2="podman2${cr}${nl}podman3${cr}"
     expect3="podman1${cr}${nl}podman2${cr}${nl}podman3${cr}"