diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-20 11:22:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-20 11:22:43 -0400 |
| commit | 36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8 (patch) | |
| tree | 9883d07d47e45ad05b53d1fa626d33b342ba5d5e /test/endpoint/setup.go | |
| parent | 6c0b600e7d49d17db6eedd21b755b5d4f1a15b11 (diff) | |
| parent | 1b4933376f4e6738ff3a0c42a2e27c6d21c07e7c (diff) | |
| download | podman-36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8.tar.gz podman-36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8.tar.bz2 podman-36682115b0f3f5f7cfcc6bc4580e5a7435b9a4d8.zip | |
Merge pull request #7126 from mheon/fix_missing_ociruntime
Fix missing OCI Runtime
Diffstat (limited to 'test/endpoint/setup.go')
| -rw-r--r-- | test/endpoint/setup.go | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/test/endpoint/setup.go b/test/endpoint/setup.go index 56cab06b0..6bbc8d2bc 100644 --- a/test/endpoint/setup.go +++ b/test/endpoint/setup.go @@ -51,14 +51,7 @@ func Setup(tempDir string) *EndpointTestIntegration { ociRuntime := os.Getenv("OCI_RUNTIME") if ociRuntime == "" { - var err error - ociRuntime, err = exec.LookPath("runc") - // If we cannot find the runc binary, setting to something static as we have no way - // to return an error. The tests will fail and point out that the runc binary could - // not be found nicely. - if err != nil { - ociRuntime = "/usr/bin/runc" - } + ociRuntime = "runc" } os.Setenv("DISABLE_HC_SYSTEMD", "true") CNIConfigDir := "/etc/cni/net.d" |