summaryrefslogtreecommitdiff
path: root/test/system
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-04-22 08:01:12 +0200
committerValentin Rothberg <rothberg@redhat.com>2021-05-05 11:30:12 +0200
commit0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21 (patch)
tree192e52054de2abf0c92d83ecdbc71d498c2ec947 /test/system
parent8eefca5a257121b177562742c972e39e1686140d (diff)
downloadpodman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.tar.gz
podman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.tar.bz2
podman-0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21.zip
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'test/system')
-rw-r--r--test/system/010-images.bats6
-rw-r--r--test/system/020-tag.bats2
-rw-r--r--test/system/030-run.bats18
-rw-r--r--test/system/060-mount.bats2
-rw-r--r--test/system/070-build.bats7
5 files changed, 17 insertions, 18 deletions
diff --git a/test/system/010-images.bats b/test/system/010-images.bats
index e7c88408e..bda331e6b 100644
--- a/test/system/010-images.bats
+++ b/test/system/010-images.bats
@@ -64,7 +64,7 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z
run_podman commit my-container my-test-image
run_podman images my-test-image --format '{{ .History }}'
- is "$output" "" "Image has empty history to begin with"
+ is "$output" "localhost/my-test-image:latest" "image history with initial name"
# Generate two randomish tags; 'tr' because they must be all lower-case
rand_name1="test-image-history-$(random_string 10 | tr A-Z a-z)"
@@ -74,13 +74,13 @@ Labels.created_at | 20[0-9-]\\\+T[0-9:]\\\+Z
run_podman tag my-test-image $rand_name1
run_podman rmi $rand_name1
run_podman images my-test-image --format '{{ .History }}'
- is "$output" "localhost/${rand_name1}:latest" "image history after one tag"
+ is "$output" "localhost/my-test-image:latest, localhost/${rand_name1}:latest" "image history after one tag"
# Repeat with second tag. Now both tags should be in history
run_podman tag my-test-image $rand_name2
run_podman rmi $rand_name2
run_podman images my-test-image --format '{{ .History }}'
- is "$output" "localhost/${rand_name2}:latest, localhost/${rand_name1}:latest" \
+ is "$output" "localhost/my-test-image:latest, localhost/${rand_name2}:latest, localhost/${rand_name1}:latest" \
"image history after two tags"
run_podman rmi my-test-image
diff --git a/test/system/020-tag.bats b/test/system/020-tag.bats
index 1f5eede39..945781afd 100644
--- a/test/system/020-tag.bats
+++ b/test/system/020-tag.bats
@@ -29,7 +29,7 @@ function _tag_and_check() {
# Test error case.
run_podman 125 untag $IMAGE registry.com/foo:bar
- is "$output" "Error: \"registry.com/foo:bar\": no such tag"
+ is "$output" "Error: registry.com/foo:bar: tag not known"
}
@test "podman untag all" {
diff --git a/test/system/030-run.bats b/test/system/030-run.bats
index 2b83fa56e..9a136ff13 100644
--- a/test/system/030-run.bats
+++ b/test/system/030-run.bats
@@ -142,7 +142,7 @@ echo $rand | 0 | $rand
NONLOCAL_IMAGE="$PODMAN_NONLOCAL_IMAGE_FQN"
run_podman 125 run --pull=never $NONLOCAL_IMAGE true
- is "$output" "Error: unable to find a name and tag match for $NONLOCAL_IMAGE in repotags: no such image" "--pull=never [with image not present]: error"
+ is "$output" "Error: $NONLOCAL_IMAGE: image not known" "--pull=never [with image not present]: error"
run_podman run --pull=missing $NONLOCAL_IMAGE true
is "$output" "Trying to pull .*" "--pull=missing [with image NOT PRESENT]: fetches"
@@ -153,13 +153,11 @@ echo $rand | 0 | $rand
run_podman run --pull=always $NONLOCAL_IMAGE true
is "$output" "Trying to pull .*" "--pull=always [with image PRESENT]: re-fetches"
- # Very weird corner case fixed by #7770: 'podman run foo' will run 'myfoo'
- # if it exists, because the string 'foo' appears in 'myfoo'. This test
- # covers that, as well as making sure that our testimage (which is always
- # tagged :YYYYMMDD, never :latest) doesn't match either.
- run_podman tag $IMAGE my${PODMAN_TEST_IMAGE_NAME}:latest
- run_podman 125 run --pull=never $PODMAN_TEST_IMAGE_NAME true
- is "$output" "Error: unable to find a name and tag match for $PODMAN_TEST_IMAGE_NAME in repotags: no such image" \
+ # NOTE: older version of podman would match "foo" against "myfoo". That
+ # behaviour was changed with introduction of `containers/common/libimage`
+ # which will only match at repository boundaries (/).
+ run_podman 125 run --pull=never my$PODMAN_TEST_IMAGE_NAME true
+ is "$output" "Error: my$PODMAN_TEST_IMAGE_NAME: image not known" \
"podman run --pull=never with shortname (and implicit :latest)"
# ...but if we add a :latest tag (without 'my'), it should now work
@@ -169,7 +167,7 @@ echo $rand | 0 | $rand
"podman run --pull=never, with shortname, succeeds if img is present"
run_podman rm -a
- run_podman rmi $NONLOCAL_IMAGE {my,}${PODMAN_TEST_IMAGE_NAME}:latest
+ run_podman rmi $NONLOCAL_IMAGE ${PODMAN_TEST_IMAGE_NAME}:latest
}
# 'run --rmi' deletes the image in the end unless it's used by another container
@@ -243,7 +241,7 @@ echo $rand | 0 | $rand
# Save it as a tar archive
run_podman commit myc myi
archive=$PODMAN_TMPDIR/archive.tar
- run_podman save myi -o $archive
+ run_podman save --quiet myi -o $archive
is "$output" "" "podman save"
# Clean up image and container from container storage...
diff --git a/test/system/060-mount.bats b/test/system/060-mount.bats
index f04f34bf6..63a93e13b 100644
--- a/test/system/060-mount.bats
+++ b/test/system/060-mount.bats
@@ -70,7 +70,7 @@ load helpers
is "$output" "" "podman image umount: does not re-umount"
run_podman 125 image umount no-such-container
- is "$output" "Error: unable to find a name and tag match for no-such-container in repotags: no such image" \
+ is "$output" "Error: no-such-container: image not known" \
"error message from image umount no-such-container"
run_podman image mount
diff --git a/test/system/070-build.bats b/test/system/070-build.bats
index 6ae78de2e..a2c8ae588 100644
--- a/test/system/070-build.bats
+++ b/test/system/070-build.bats
@@ -393,9 +393,9 @@ Labels.$label_name | $label_value
"image tree: third line"
is "${lines[3]}" "Image Layers" \
"image tree: fourth line"
- is "${lines[4]}" "... ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[$IMAGE]" \
+ is "${lines[4]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \
"image tree: first layer line"
- is "${lines[-1]}" "... ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[localhost/build_test:latest]" \
+ is "${lines[-1]}" ".* ID: [0-9a-f]\{12\} Size: .* Top Layer of: \[$IMAGE]" \
"image tree: last layer line"
# FIXME: 'image tree --whatrequires' does not work via remote
@@ -553,6 +553,7 @@ STEP 2: RUN echo x${random2}y
x${random2}y${remote_extra}
STEP 3: COMMIT build_test${remote_extra}
--> [0-9a-f]\{11\}
+Successfully tagged localhost/build_test:latest
[0-9a-f]\{64\}
a${random3}z"
@@ -698,7 +699,7 @@ EOF
# we're happy.
if ! is_remote; then
is "$output" \
- ".* pull policy is .never. but .* could not be found locally" \
+ ".*Error: error creating build container: quay.io/libpod/nosuchimage:nosuchtag: image not known" \
"--pull-never fails with expected error message"
fi
}