summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2018-06-21 09:53:29 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-22 13:19:08 +0000
commit2c81a756e310d59702b52ffc30d84aa9e11a8dbd (patch)
treedccca49fc4638f9739a0baf2682808b15aa51bb4 /test
parent4ad7e7368140f4677f8919f647cd5d6951d7e60e (diff)
downloadpodman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.tar.gz
podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.tar.bz2
podman-2c81a756e310d59702b52ffc30d84aa9e11a8dbd.zip
Update the version of conmon used in test
Also start using podmin in /usr/libexec/podman rather then crio. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com> Closes: #979 Approved by: baude
Diffstat (limited to 'test')
-rw-r--r--test/e2e/libpod_suite_test.go4
-rw-r--r--test/e2e/run_ns_test.go9
-rw-r--r--test/e2e/run_signal_test.go2
3 files changed, 8 insertions, 7 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 3d444f662..542122daf 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -28,7 +28,7 @@ import (
"github.com/projectatomic/libpod/pkg/inspect"
)
-// - CRIO_ROOT=/var/tmp/checkout PODMAN_BINARY=/usr/bin/podman CONMON_BINARY=/usr/libexec/crio/conmon PAPR=1 sh .papr.sh
+// - CRIO_ROOT=/var/tmp/checkout PODMAN_BINARY=/usr/bin/podman CONMON_BINARY=/usr/libexec/podman/conmon PAPR=1 sh .papr.sh
// PODMAN_OPTIONS="--root $TESTDIR/crio $STORAGE_OPTIONS --runroot $TESTDIR/crio-run --runtime ${RUNTIME_BINARY} --conmon ${CONMON_BINARY} --cni-config-dir ${LIBPOD_CNI_CONFIG}"
//TODO do the image caching
@@ -131,7 +131,7 @@ func PodmanCreate(tempDir string) PodmanTest {
if os.Getenv("PODMAN_BINARY") != "" {
podmanBinary = os.Getenv("PODMAN_BINARY")
}
- conmonBinary := filepath.Join("/usr/libexec/crio/conmon")
+ conmonBinary := filepath.Join("/usr/libexec/podman/conmon")
altConmonBinary := "/usr/libexec/podman/conmon"
if _, err := os.Stat(altConmonBinary); err == nil {
conmonBinary = altConmonBinary
diff --git a/test/e2e/run_ns_test.go b/test/e2e/run_ns_test.go
index 1dfec9f64..ccc534780 100644
--- a/test/e2e/run_ns_test.go
+++ b/test/e2e/run_ns_test.go
@@ -46,16 +46,17 @@ var _ = Describe("Podman run ns", func() {
})
It("podman run ipcns test", func() {
- setup := podmanTest.SystemExec("mktemp", []string{"/dev/shm/podmantest.XXXX)"})
+ testFile := "/dev/shm/podmantest"
+ setup := podmanTest.SystemExec("touch", []string{testFile})
setup.WaitWithDefaultTimeout()
Expect(setup.ExitCode()).To(Equal(0))
- session := podmanTest.Podman([]string{"run", "--ipc=host", fedoraMinimal, "ls", setup.OutputToString()})
+ session := podmanTest.Podman([]string{"run", "--ipc=host", fedoraMinimal, "ls", testFile})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- Expect(session.OutputToString()).To(ContainSubstring(setup.OutputToString()))
+ Expect(session.OutputToString()).To(ContainSubstring(testFile))
- err := os.Remove(setup.OutputToString())
+ err := os.Remove(testFile)
Expect(err).To(BeNil())
})
diff --git a/test/e2e/run_signal_test.go b/test/e2e/run_signal_test.go
index 57beaee6f..9a9f5d1ad 100644
--- a/test/e2e/run_signal_test.go
+++ b/test/e2e/run_signal_test.go
@@ -133,7 +133,7 @@ var _ = Describe("Podman run with --sig-proxy", func() {
Expect(killSession.ExitCode()).To(Equal(0))
session.WaitWithDefaultTimeout()
- Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.ExitCode()).To(Equal(137))
ok, _ = session.GrepString(fmt.Sprintf("Received %d", signal))
Expect(ok).To(BeFalse())
})