Merge pull request #10996 from cdoern/untilLog

Implemented --until flag for Libpod's Container Logs

2 files changed, 78 insertions, 0 deletions

diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index 507fab461..0a973b802 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -5,6 +5,7 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+	"time"
 
 	. "github.com/containers/podman/v3/test/utils"
 	. "github.com/onsi/ginkgo"
@@ -135,6 +136,34 @@ var _ = Describe("Podman logs", func() {
 			Expect(len(results.OutputToStringArray())).To(Equal(3))
 		})
 
+		It("until duration 10m: "+log, func() {
+			logc := podmanTest.Podman([]string{"run", "--log-driver", log, "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
+			logc.WaitWithDefaultTimeout()
+			Expect(logc).To(Exit(0))
+			cid := logc.OutputToString()
+
+			results := podmanTest.Podman([]string{"logs", "--until", "10m", cid})
+			results.WaitWithDefaultTimeout()
+			Expect(results).To(Exit(0))
+			Expect(len(results.OutputToStringArray())).To(Equal(0))
+		})
+
+		It("until time NOW: "+log, func() {
+
+			logc := podmanTest.Podman([]string{"run", "--log-driver", log, "-dt", ALPINE, "sh", "-c", "echo podman; echo podman; echo podman"})
+			logc.WaitWithDefaultTimeout()
+			Expect(logc).To(Exit(0))
+			cid := logc.OutputToString()
+
+			now := time.Now()
+			now = now.Add(time.Minute * 1)
+			nowS := now.Format(time.RFC3339)
+			results := podmanTest.Podman([]string{"logs", "--until", nowS, cid})
+			results.WaitWithDefaultTimeout()
+			Expect(results).To(Exit(0))
+			Expect(len(results.OutputToStringArray())).To(Equal(3))
+		})
+
 		It("latest and container name should fail: "+log, func() {
 			results := podmanTest.Podman([]string{"logs", "-l", "foobar"})
 			results.WaitWithDefaultTimeout()
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index ccf83df14..32282c8e1 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -24,6 +24,9 @@ load helpers
     # test --since with Unix timestamps
     run_podman logs --since 1000 $cid
 
+    # test --until with Unix timestamps
+    run_podman logs --until 1000 $cid
+
     run_podman rm $cid
 }
 
@@ -125,4 +128,50 @@ $s_after"
     _log_test_since journald
 }
 
+function _log_test_until() {
+    local driver=$1
+
+    s_before="before_$(random_string)_${driver}"
+    s_after="after_$(random_string)_${driver}"
+
+    before=$(date --iso-8601=seconds)
+    sleep 5
+    run_podman run --log-driver=$driver -d --name test $IMAGE sh -c \
+        "echo $s_before; trap 'echo $s_after; exit' SIGTERM; while :; do sleep 1; done"
+
+    # sleep a second to make sure the date is after the first echo
+    sleep 1
+    run_podman stop test
+    # sleep for 20 seconds to get the proper after time
+    sleep 20
+
+    run_podman logs test
+    is "$output" \
+        "$s_before
+$s_after"
+
+    run_podman logs --until $before test
+    is "$output" \
+        ""
+
+    after=$(date --iso-8601=seconds)
+
+    run_podman logs --until $after test
+    is "$output" \
+        "$s_before
+$s_after"
+    run_podman rm -f test
+}
+
+@test "podman logs - until k8s-file" {
+    _log_test_until k8s-file
+}
+
+@test "podman logs - until journald" {
+    # We can't use journald on RHEL as rootless: rhbz#1895105
+    skip_if_journald_unavailable
+
+    _log_test_until journald
+}
+
 # vim: filetype=sh