opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-01 02:27:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23979 from edsantiago/workaround-remote-events-flake

Browse Source 
CI: e2e: workaround for events out-of-sequence flake
This commit is contained in:
openshift-merge-bot[bot]
2024-09-17 12:49:19 +00:00
committed by GitHub
parent a4794bc9c6 111a4bbe71
commit 214e64e287
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/e2e/events_test.go
View File

@@ -262,12 +262,22 @@ var _ = Describe("Podman events", func() {
result = podmanTest.Podman([]string{"events", "--stream=false", "--since", "30s"}) result = podmanTest.Podman([]string{"events", "--stream=false", "--since", "30s"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(ExitCleanly()) Expect(result).Should(ExitCleanly())
lines := result.OutputToStringArray()
Expect(lines).To(HaveLen(5)) eventDetails := fmt.Sprintf(" %s (container=%s, name=%s)", ctrID, ctrID, network)
Expect(lines[3]).To(ContainSubstring("network connect")) // Workaround for #23634, event order not guaranteed when remote.
Expect(lines[3]).To(ContainSubstring(fmt.Sprintf("(container=%s, name=%s)", ctrID, network))) // Although the issue is closed, the bug is a real one. It seems
Expect(lines[4]).To(ContainSubstring("network disconnect")) // unlikely ever to be fixed.
Expect(lines[4]).To(ContainSubstring(fmt.Sprintf("(container=%s, name=%s)", ctrID, network))) if IsRemote() {
lines := result.OutputToString()
Expect(lines).To(ContainSubstring("network connect" + eventDetails))
Expect(lines).To(ContainSubstring("network disconnect" + eventDetails))
Expect(lines).To(MatchRegexp(" network connect .* network disconnect "))
} else {
lines := result.OutputToStringArray()
Expect(lines).To(HaveLen(5))
Expect(lines[3]).To(ContainSubstring("network connect" + eventDetails))
Expect(lines[4]).To(ContainSubstring("network disconnect" + eventDetails))
}
}) })
It("podman events health_status generated", func() { It("podman events health_status generated", func() {