opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-26 10:45:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify E2E tests to use alternate Conmon path if present

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>

Closes: #474
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-03-14 10:20:38 -04:00
committed by Atomic Bot
parent 392d998143
commit 911e36dd0f
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/libpod_suite_test.go
View File

@ -117,6 +117,10 @@ func PodmanCreate(tempDir string) PodmanTest {
podmanBinary = os.Getenv("PODMAN_BINARY") podmanBinary = os.Getenv("PODMAN_BINARY")
} }
conmonBinary := filepath.Join("/usr/libexec/crio/conmon") 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") != "" { if os.Getenv("CONMON_BINARY") != "" {
conmonBinary = os.Getenv("CONMON_BINARY") conmonBinary = os.Getenv("CONMON_BINARY")
} }