From 43bcf99e6d36206f110514c153ca513d8f4453be Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 6 Sep 2018 14:53:54 -0400
Subject: Change shm test to be less flaky.
This tests fails a lot, I think because of a race condition. Changing to
just make sure the inode of the /dev/shm on the host is the same as inside
the container.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Closes: #1420
Approved by: mheon
---
test/e2e/run_ns_test.go | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go
index 56be68c48..a61b4ab03 100644
--- a/test/e2e/run_ns_test.go
+++ b/test/e2e/run_ns_test.go
@@ -48,18 +48,15 @@ var _ = Describe("Podman run ns", func() {
})
It("podman run ipcns test", func() {
- testFile := "/dev/shm/podmantest"
- setup := podmanTest.SystemExec("touch", []string{testFile})
+ setup := podmanTest.SystemExec("ls", []string{"--inode", "-d", "/dev/shm"})
setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0))
+ hostShm := setup.OutputToString()
- session := podmanTest.Podman([]string{"run", "--ipc=host", fedoraMinimal, "ls", testFile})
+ session := podmanTest.Podman([]string{"run", "--ipc=host", fedoraMinimal, "ls", "--inode", "-d", "/dev/shm"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- Expect(session.OutputToString()).To(ContainSubstring(testFile))
-
- err := os.Remove(testFile)
- Expect(err).To(BeNil())
+ Expect(session.OutputToString()).To(Equal(hostShm))
})
It("podman run bad ipc pid test", func() {
--
cgit v1.2.3-54-g00ecf