opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3514 from baude/cornflakes

Browse Source 
fix integration flake tests
This commit is contained in:
OpenShift Merge Robot
2019-07-08 17:14:08 +02:00
committed by GitHub
parent 4157a7219c 3dee49f131
commit 1055b22e9b
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/run_cleanup_test.go
View File

@ -4,6 +4,7 @@ package integration
import ( import (
"os" "os"
"strings"
. "github.com/containers/libpod/test/utils" . "github.com/containers/libpod/test/utils"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
@ -35,18 +36,32 @@ var _ = Describe("Podman run exit", func() {
}) })
It("podman run -d mount cleanup test", func() { It("podman run -d mount cleanup test", func() {
result := podmanTest.Podman([]string{"run", "-dt", ALPINE, "top"})
result.WaitWithDefaultTimeout()
cid := result.OutputToString()
Expect(result.ExitCode()).To(Equal(0))
mount := SystemExec("mount", nil) mount := SystemExec("mount", nil)
Expect(mount.ExitCode()).To(Equal(0)) Expect(mount.ExitCode()).To(Equal(0))
Expect(strings.Contains(mount.OutputToString(), cid))
out1 := mount.OutputToString() pmount := podmanTest.Podman([]string{"mount", "--notruncate"})
result := podmanTest.Podman([]string{"create", "-dt", ALPINE, "echo", "hello"}) pmount.WaitWithDefaultTimeout()
result.WaitWithDefaultTimeout() Expect(strings.Contains(pmount.OutputToString(), cid))
Expect(result.ExitCode()).To(Equal(0)) Expect(pmount.ExitCode()).To(Equal(0))
stop := podmanTest.Podman([]string{"stop", cid})
stop.WaitWithDefaultTimeout()
Expect(stop.ExitCode()).To(Equal(0))
mount = SystemExec("mount", nil) mount = SystemExec("mount", nil)
Expect(mount.ExitCode()).To(Equal(0)) Expect(mount.ExitCode()).To(Equal(0))
Expect(!strings.Contains(mount.OutputToString(), cid))
pmount = podmanTest.Podman([]string{"mount", "--notruncate"})
pmount.WaitWithDefaultTimeout()
Expect(!strings.Contains(pmount.OutputToString(), cid))
Expect(pmount.ExitCode()).To(Equal(0))
out2 := mount.OutputToString()
Expect(out1).To(Equal(out2))
}) })
}) })

4
test/e2e/run_staticip_test.go
View File

@ -56,10 +56,10 @@ var _ = Describe("Podman run with --ip flag", func() {
}) })
It("Podman run with specified static IP has correct IP", func() { It("Podman run with specified static IP has correct IP", func() {
result := podmanTest.Podman([]string{"run", "-ti", "--ip", "10.88.64.128", ALPINE, "ip", "addr"}) result := podmanTest.Podman([]string{"run", "-ti", "--ip", "10.88.63.2", ALPINE, "ip", "addr"})
result.WaitWithDefaultTimeout() result.WaitWithDefaultTimeout()
Expect(result.ExitCode()).To(Equal(0)) Expect(result.ExitCode()).To(Equal(0))
Expect(result.OutputToString()).To(ContainSubstring("10.88.64.128/16")) Expect(result.OutputToString()).To(ContainSubstring("10.88.63.2/16"))
}) })
It("Podman run two containers with the same IP", func() { It("Podman run two containers with the same IP", func() {