diff options
| -rwxr-xr-x | test/buildah-bud/apply-podman-deltas | 11 | ||||
| -rwxr-xr-x | test/buildah-bud/run-buildah-bud-tests | 9 | ||||
| -rw-r--r-- | test/system/010-images.bats | 6 | ||||
| -rw-r--r-- | test/system/120-load.bats | 1 | ||||
| -rw-r--r-- | test/system/200-pod.bats | 2 |
5 files changed, 19 insertions, 10 deletions
diff --git a/test/buildah-bud/apply-podman-deltas b/test/buildah-bud/apply-podman-deltas index 3b3c5592a..d6d539fa4 100755 --- a/test/buildah-bud/apply-podman-deltas +++ b/test/buildah-bud/apply-podman-deltas @@ -129,10 +129,10 @@ errmsg "no such file or directory" \ errmsg "no such file or directory" \ "Error: no context directory and no Containerfile specified" \ - "bud without any arguments should fail when no Dockerfile exist" + "bud without any arguments should fail when no Dockerfile exists" errmsg "is not a file" \ - "Error: open .*: no such file or directory" \ + "Error: containerfile: .* cannot be path to a directory" \ "bud with specified context should fail if assumed Dockerfile is a directory" errmsg "no such file or directory" \ @@ -215,7 +215,8 @@ skip_if_remote "--output option not implemented in podman-remote" \ "build with custom build output and output rootfs to directory" \ "build with custom build output and output rootfs to tar" \ "build with custom build output and output rootfs to tar by pipe" \ - "build with custom build output must fail for bad input" + "build with custom build output must fail for bad input" \ + "build with custom build output and output rootfs to tar with no additional step" # https://github.com/containers/podman/issues/14544 skip_if_remote "logfile not implemented on remote" "bud-logfile-with-split-logfile-by-platform" @@ -223,6 +224,10 @@ skip_if_remote "logfile not implemented on remote" "bud-logfile-with-split-logfi skip_if_remote "envariables do not automatically work with -remote." \ "build proxy" +# 2022-07-04 this is a new test in buildah; it's failing in treadmill +skip_if_remote "FIXME FIXME FIXME: does this test make sense in remote?" \ + "build-test with OCI prestart hook" + ############################################################################### # BEGIN tests which are skipped due to actual podman or podman-remote bugs. diff --git a/test/buildah-bud/run-buildah-bud-tests b/test/buildah-bud/run-buildah-bud-tests index 4ff062496..d0e2e3237 100755 --- a/test/buildah-bud/run-buildah-bud-tests +++ b/test/buildah-bud/run-buildah-bud-tests @@ -94,10 +94,13 @@ fi set -e # Run sudo early, to refresh the credentials cache. This is a NOP under CI, -# but might be appreciated by developers who run this script, step away +# but might be appreciated by developers who run this script, step away # during the git-checkout-buildah step, then come back twenty minutes later -# to an expired sudo prompt and no tests have run. -sudo --validate +# to an expired sudo prompt and no tests have run. (No need to do this +# for checkout; only when running tests) +if [[ -n $do_test ]]; then + sudo --validate +fi # Before pulling buildah (while still cd'ed to podman repo), try to determine # if this is a PR, and if so if it's a revendoring of buildah. We use this to diff --git a/test/system/010-images.bats b/test/system/010-images.bats index 69ed1004c..638910302 100644 --- a/test/system/010-images.bats +++ b/test/system/010-images.bats @@ -259,8 +259,8 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z run_podman 2 rmi -a is "$output" "Error: 2 errors occurred: -.** Image used by .*: image is in use by a container -.** Image used by .*: image is in use by a container" +.** image used by .*: image is in use by a container +.** image used by .*: image is in use by a container" run_podman rmi -af is "$output" "Untagged: $IMAGE @@ -292,7 +292,7 @@ Deleted: $pauseID" "infra images gets removed as well" pauseID=$output run_podman 2 rmi $pauseImage - is "$output" "Error: Image used by .* image is in use by a container" + is "$output" "Error: image used by .* image is in use by a container" run_podman rmi -f $pauseImage is "$output" "Untagged: $pauseImage diff --git a/test/system/120-load.bats b/test/system/120-load.bats index 7f0bcfd95..8dcdd8bdd 100644 --- a/test/system/120-load.bats +++ b/test/system/120-load.bats @@ -158,6 +158,7 @@ verify_iid_and_name() { run_podman 125 image scp $nope ${notme}@localhost:: is "$output" "Error: $nope: image not known.*" "Pushing nonexistent image" + run_podman rmi foobar:123 } diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats index b93f3f92f..7b7f5e8bb 100644 --- a/test/system/200-pod.bats +++ b/test/system/200-pod.bats @@ -322,7 +322,7 @@ EOF is "$output" "" "output from pod create should be empty" run_podman 125 pod create --infra-name "$infra_name" - assert "$output" =~ "^Error: .*: the container name \"$infra_name\" is already in use by .* You have to remove that container to be able to reuse that name.: that name is already in use" \ + assert "$output" =~ "^Error: .*: the container name \"$infra_name\" is already in use by .* You have to remove that container to be able to reuse that name: that name is already in use" \ "Trying to create two pods with same infra-name" run_podman pod rm -f $pod_name |