summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-29 22:21:17 +0100
committerGitHub <noreply@github.com>2020-10-29 22:21:17 +0100
commit228396a99dc88fc828f23d4072a46ca8de90282f (patch)
treea77a837e89e0a267d01e53ddd4f0fd580941eab9 /test
parent1ce5ece66f567d3a3e52f9a9b5945222eda2d6a2 (diff)
parent0f191ad72c406cfe8223946c069f6ec70f559664 (diff)
downloadpodman-228396a99dc88fc828f23d4072a46ca8de90282f.tar.gz
podman-228396a99dc88fc828f23d4072a46ca8de90282f.tar.bz2
podman-228396a99dc88fc828f23d4072a46ca8de90282f.zip
Merge pull request #8174 from rhatdan/errors
Podman often reports OCI Runtime does not exist, even if it does
Diffstat (limited to 'test')
-rw-r--r--test/system/030-run.bats4
-rw-r--r--test/system/160-volumes.bats2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 6b6964c63..b0c855d81 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -14,8 +14,8 @@ load helpers
# ...but check the configured runtime engine, and switch to crun as needed
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/crun"; then
- err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI runtime command not found error"
- err_no_exec_dir="Error: open executable: Operation not permitted: OCI runtime permission denied error"
+ err_no_such_cmd="Error: executable file.* not found in \$PATH: No such file or directory: OCI not found"
+ err_no_exec_dir="Error: open executable: Operation not permitted: OCI permission denied"
fi
tests="
diff --git a/test/system/160-volumes.bats b/test/system/160-volumes.bats
index 9f4bb76a2..c19e61669 100644
--- a/test/system/160-volumes.bats
+++ b/test/system/160-volumes.bats
@@ -119,7 +119,7 @@ EOF
# noexec option. This should fail.
# ARGH. Unfortunately, runc (used for cgroups v1) produces a different error
local expect_rc=126
- local expect_msg='.* OCI runtime permission denied.*'
+ local expect_msg='.* OCI permission denied.*'
run_podman info --format '{{ .Host.OCIRuntime.Path }}'
if expr "$output" : ".*/runc"; then
expect_rc=1