summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2018-03-14 10:20:38 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2018-03-14 14:54:43 +0000
commit911e36dd0f2c47d6e1e1d81282ec67ca2fb3b14c (patch)
treef8c97346b57ce5624ab5594b709858eb325a86fc
parent392d998143174644920e9141c615b15450d5bb01 (diff)
downloadpodman-911e36dd0f2c47d6e1e1d81282ec67ca2fb3b14c.tar.gz
podman-911e36dd0f2c47d6e1e1d81282ec67ca2fb3b14c.tar.bz2
podman-911e36dd0f2c47d6e1e1d81282ec67ca2fb3b14c.zip
Modify E2E tests to use alternate Conmon path if present
Signed-off-by: Matthew Heon <mheon@redhat.com> Closes: #474 Approved by: rhatdan
-rw-r--r--test/e2e/libpod_suite_test.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 6938ea571..87017ad27 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -117,6 +117,10 @@ func PodmanCreate(tempDir string) PodmanTest {
podmanBinary = os.Getenv("PODMAN_BINARY")
}
conmonBinary := filepath.Join("/usr/libexec/crio/conmon")
+ altConmonBinary := "/usr/libexec/podman/conmon"
+ if _, err := os.Stat(altConmonBinary); err == nil {
+ conmonBinary = altConmonBinary
+ }
if os.Getenv("CONMON_BINARY") != "" {
conmonBinary = os.Getenv("CONMON_BINARY")
}