opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 21:07:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let's see if #14653 is fixed or not

Browse Source 
Signed-off-by: Ed Santiago <santiago@redhat.com>
This commit is contained in:
Ed Santiago
2023-01-11 15:06:33 -07:00
parent db84b2ba0e
commit ca91cf416f
1 changed files with 0 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
test/e2e/checkpoint_test.go
View File

@ -27,27 +27,6 @@ func getRunString(input []string) []string {
return append(runString, input...) return append(runString, input...)
} }
// FIXME FIXME FIXME: workaround for #14653, please remove this function
// and all calls to it once that bug is fixed.
func fixmeFixme14653(podmanTest *PodmanTestIntegration, cid string) {
if !IsRemote() {
// Race condition only affects podman-remote
return
}
// Wait for container to truly go away
for i := 0; i < 5; i++ {
ps := podmanTest.Podman([]string{"container", "exists", cid})
ps.WaitWithDefaultTimeout()
if ps.ExitCode() == 1 {
// yay, it's gone
return
}
time.Sleep(time.Second)
}
// Fall through. Container still exists, but return anyway.
}
var _ = Describe("Podman checkpoint", func() { var _ = Describe("Podman checkpoint", func() {
var ( var (
tempdir string tempdir string
@ -534,7 +513,6 @@ var _ = Describe("Podman checkpoint", func() {
// As the container has been started with '--rm' it will be completely // As the container has been started with '--rm' it will be completely
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -588,7 +566,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -608,7 +585,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -628,7 +604,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -648,7 +623,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -712,7 +686,6 @@ var _ = Describe("Podman checkpoint", func() {
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -763,7 +736,6 @@ var _ = Describe("Podman checkpoint", func() {
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -806,7 +778,6 @@ var _ = Describe("Podman checkpoint", func() {
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -845,7 +816,6 @@ var _ = Describe("Podman checkpoint", func() {
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -896,7 +866,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -967,7 +936,6 @@ var _ = Describe("Podman checkpoint", func() {
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1118,7 +1086,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1215,7 +1182,6 @@ var _ = Describe("Podman checkpoint", func() {
// As the container has been started with '--rm' it will be completely // As the container has been started with '--rm' it will be completely
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).To(Exit(0)) Expect(result).To(Exit(0))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
Expect(podmanTest.NumberOfContainers()).To(Equal(1)) Expect(podmanTest.NumberOfContainers()).To(Equal(1))
@ -1329,7 +1295,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1374,7 +1339,6 @@ var _ = Describe("Podman checkpoint", func() {
// As the container has been started with '--rm' it will be completely // As the container has been started with '--rm' it will be completely
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1563,7 +1527,6 @@ var _ = Describe("Podman checkpoint", func() {
// As the container has been started with '--rm' it will be completely // As the container has been started with '--rm' it will be completely
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1661,7 +1624,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(session).Should(Exit(0)) Expect(session).Should(Exit(0))
Expect(session.OutputToString()).To(ContainSubstring(cid)) Expect(session.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1736,7 +1698,6 @@ var _ = Describe("Podman checkpoint", func() {
// As the container has been started with '--rm' it will be completely // As the container has been started with '--rm' it will be completely
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))
@ -1816,7 +1777,6 @@ var _ = Describe("Podman checkpoint", func() {
// cleaned up after checkpointing. // cleaned up after checkpointing.
Expect(result).Should(Exit(0)) Expect(result).Should(Exit(0))
Expect(result.OutputToString()).To(ContainSubstring(cid)) Expect(result.OutputToString()).To(ContainSubstring(cid))
fixmeFixme14653(podmanTest, cid)
Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0)) Expect(podmanTest.NumberOfContainersRunning()).To(Equal(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(0)) Expect(podmanTest.NumberOfContainers()).To(Equal(0))