Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e: fix logs tests about an error message #18279

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion test/e2e/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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))
Expand Down