diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-27 03:05:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 03:05:33 +0200 |
| commit | 7705f99fe6cabe5028483e623b21177e25cc5d6f (patch) | |
| tree | b2c156d17b74ef6a265e39cd157dc6c052532049 /test | |
| parent | c06d9898f91fb2dcddff4f9b65df13c2f158cfd0 (diff) | |
| parent | fc32439c298a107bd31f64fb7b6d396bce525e57 (diff) | |
| download | podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.tar.gz podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.tar.bz2 podman-7705f99fe6cabe5028483e623b21177e25cc5d6f.zip | |
Merge pull request #3429 from cevich/strip_crio_conmon
Remove refs to crio/conmon
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/common_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 8b6eab892..c3a37236b 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -195,7 +195,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration { } } conmonBinary := filepath.Join("/usr/libexec/podman/conmon") - altConmonBinary := "/usr/libexec/crio/conmon" + altConmonBinary := "/usr/bin/conmon" if _, err := os.Stat(conmonBinary); os.IsNotExist(err) { conmonBinary = altConmonBinary } |