Merge pull request containers#3514 from baude/cornflakes

fix integration flake tests

test/e2e/run_cleanup_test.go

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

test/e2e/run_staticip_test.go

@@ -56,10 +56,10 @@ var _ = Describe("Podman run with --ip flag", 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()
 		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() {