diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | contrib/cirrus/CIModes.md | 2 | ||||
| -rw-r--r-- | test/apiv2/12-imagesMore.at | 2 | ||||
| -rwxr-xr-x | test/buildah-bud/apply-podman-deltas | 2 | ||||
| -rw-r--r-- | test/system/170-run-userns.bats | 4 |
5 files changed, 6 insertions, 6 deletions
@@ -258,7 +258,7 @@ test/version/version: version/version.go .PHONY: codespell codespell: - codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L uint,iff,od,seeked,splitted,marge,ERRO,hist,ether -w + codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether -w .PHONY: validate validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit diff --git a/contrib/cirrus/CIModes.md b/contrib/cirrus/CIModes.md index 8b1e33bb1..c782ca64b 100644 --- a/contrib/cirrus/CIModes.md +++ b/contrib/cirrus/CIModes.md @@ -27,7 +27,7 @@ outdated) example of it's output can be seen below: [The list is documented](https://cirrus-ci.org/guide/writing-tasks/#environment-variables). Reference to any variables defined in YAML will **not** behave how you expect, don't use them! -* Somme Cirrus-CI defined variables contain non-empty values outside their +* Some Cirrus-CI defined variables contain non-empty values outside their obvious context. For example, when running for a PR a task will have `$CIRRUS_BRANCH` set to `pull/<number>`. diff --git a/test/apiv2/12-imagesMore.at b/test/apiv2/12-imagesMore.at index fc18dd2d7..d4b09174f 100644 --- a/test/apiv2/12-imagesMore.at +++ b/test/apiv2/12-imagesMore.at @@ -63,7 +63,7 @@ podman pull -q $IMAGE podman system connection add --default test ssh://$USER@localhost/run/user/$UID/podman/podman.sock # should fail but need to check the output... # status 125 here means that the save/load fails due to -# cirrus weirdness with exec.Command. All of the args have been parsed sucessfully. +# cirrus weirdness with exec.Command. All of the args have been parsed successfully. t POST "libpod/images/scp/$IMAGE?destination=QA::" 500 \ .cause="exit status 125" t DELETE libpod/images/$IMAGE 200 \ diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index 0b691dd0e..3b3c5592a 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -197,7 +197,7 @@ skip_if_remote "--build-context option not implemented in podman-remote" \ "build-with-additional-build-context and COPY, additional context from host" \ "build-with-additional-build-context and RUN --mount=from=, additional-context not image and also test conflict with stagename" \ -skip_if_remote "env-variable for Containerfile.in pre-processing is not propogated on remote" \ +skip_if_remote "env-variable for Containerfile.in pre-processing is not propagated on remote" \ "bud with Containerfile.in, via envariable" \ # Requires a local file outside context dir diff --git a/test/system/170-run-userns.bats b/test/system/170-run-userns.bats index 84788a7f4..2ad9eb0b8 100644 --- a/test/system/170-run-userns.bats +++ b/test/system/170-run-userns.bats @@ -124,7 +124,7 @@ EOF run_podman rm -t 0 --force ${cid} else run_podman 125 run -d --userns=nomap $IMAGE sleep 100 - is "${output}" "Error: nomap is only supported in rootless mode" "Container should fail to start since nomap is not suppored in rootful mode" + is "${output}" "Error: nomap is only supported in rootless mode" "Container should fail to start since nomap is not supported in rootful mode" fi } @@ -135,6 +135,6 @@ EOF is "${output}" "$user" "Container should run as the current user" else run_podman 125 run --rm --userns=keep-id $IMAGE id -u - is "${output}" "Error: keep-id is only supported in rootless mode" "Container should fail to start since keep-id is not suppored in rootful mode" + is "${output}" "Error: keep-id is only supported in rootless mode" "Container should fail to start since keep-id is not supported in rootful mode" fi } |