diff options
| author | Ed Santiago <santiago@redhat.com> | 2022-06-14 11:36:18 -0600 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-07-26 13:34:45 -0400 |
| commit | e89550bcd37f4f201d181c48b93f9f0d4ffce3ea (patch) | |
| tree | e01bb101dd3dcbaf44d40edc8569bca02a49dea4 /test/system | |
| parent | 9c1de040b36483fed1c331c438d8bce5fd8fab58 (diff) | |
| download | podman-e89550bcd37f4f201d181c48b93f9f0d4ffce3ea.tar.gz podman-e89550bcd37f4f201d181c48b93f9f0d4ffce3ea.tar.bz2 podman-e89550bcd37f4f201d181c48b93f9f0d4ffce3ea.zip | |
buildah vendor treadmill
As you run --sync, please update this commit message with your
actual changes.
Changes since 2022-06-14:
- apply-podman-deltas: (minor) buildah 4057 changed the name
of a test; make corresponding change here
- apply-podman-deltas: buildah 4071 adds a new OCI-hook
test that's failing in remote. Skip it.
- apply-podman-deltas: buildah 4096 changed an error message
- apply-podman-deltas: buildah 4097 added a test that doesn't
work with podman-remote
- run-buildah-bud-tests: only run 'sudo --validate' if we
need to sudo later (for running tests). Otherwise, same
thing: I run the treadmill script, step away, and come
back to an unnecessary sudo prompt.
- system tests: the new containers-storage changes some
error messages; fix tests to reflect that. (And, unrelated,
fix a red cleanup warning)
Signed-off-by: Ed Santiago <santiago@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/system')
| -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 |
3 files changed, 5 insertions, 4 deletions
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 |