From 5fed3d922165353b0a43b8550149ec05e076a8bb Mon Sep 17 00:00:00 2001 From: Toshiki Sonoda Date: Thu, 20 Apr 2023 18:19:04 +0900 Subject: [PATCH] e2e: fix logs tests about an error message When events_logger is file or none, podman outputs an error message such as following: - local environment `using --follow with the journald --log-driver bug without the journald --events-backend` - remote environment `Error: channel "123" found, 0-3 supported: lost synchronization with multiplexed stream` Signed-off-by: Toshiki Sonoda --- test/e2e/logs_test.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go index 5a50869e8f..49ac48b7dd 100644 --- a/test/e2e/logs_test.go +++ b/test/e2e/logs_test.go @@ -305,7 +305,11 @@ var _ = Describe("Podman logs", func() { if log == "journald" && !isEventBackendJournald(podmanTest) { // --follow + journald log-driver is only supported with journald events-backend(PR #10431) Expect(results).To(Exit(125)) - Expect(results.ErrorToString()).To(ContainSubstring("using --follow with the journald --log-driver but without the journald --events-backend")) + err := "using --follow with the journald --log-driver but without the journald --events-backend" + if IsRemote() { + err = "lost synchronization with multiplexed" + } + Expect(results.ErrorToString()).To(ContainSubstring(err)) return } @@ -345,6 +349,11 @@ var _ = Describe("Podman logs", func() { if log == "journald" && !isEventBackendJournald(podmanTest) { // --follow + journald log-driver is only supported with journald events-backend(PR #10431) Expect(results).To(Exit(125)) + err := "using --follow with the journald --log-driver but without the journald --events-backend" + if IsRemote() { + err = "lost synchronization with multiplexed" + } + Expect(results.ErrorToString()).To(ContainSubstring(err)) return } Expect(results).To(Exit(0))