From 911e36dd0f2c47d6e1e1d81282ec67ca2fb3b14c Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Wed, 14 Mar 2018 10:20:38 -0400
Subject: Modify E2E tests to use alternate Conmon path if present

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

Closes: #474
Approved by: rhatdan
---
 test/e2e/libpod_suite_test.go | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'test')

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")
 	}
-- 
cgit v1.2.3-54-g00ecf