opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-27 05:26:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix "Storing signatures" check

Browse Source 
After[1] c/image no longer prints "Storing signatures" so we should
not check for it.

[1] https://github.com/containers/image/pull/2001

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-06-26 15:28:13 +02:00
parent b80fd54a56
commit 6eaf8a271d
5 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/bindings/test/images_test.go
View File

@ -403,7 +403,6 @@ var _ = Describe("Podman images", func() {
Expect(output).To(ContainSubstring("Copying blob ")) Expect(output).To(ContainSubstring("Copying blob "))
Expect(output).To(ContainSubstring("Copying config ")) Expect(output).To(ContainSubstring("Copying config "))
Expect(output).To(ContainSubstring("Writing manifest to image destination")) Expect(output).To(ContainSubstring("Writing manifest to image destination"))
Expect(output).To(ContainSubstring("Storing signatures"))
}) })
It("Build no options", func() { It("Build no options", func() {

1
test/e2e/manifest_test.go
View File

@ -451,7 +451,6 @@ RUN touch /file
Expect(output).To(ContainSubstring("Copying blob ")) Expect(output).To(ContainSubstring("Copying blob "))
Expect(output).To(ContainSubstring("Copying config ")) Expect(output).To(ContainSubstring("Copying config "))
Expect(output).To(ContainSubstring("Writing manifest to image destination")) Expect(output).To(ContainSubstring("Writing manifest to image destination"))
Expect(output).To(ContainSubstring("Storing signatures"))
push = podmanTest.Podman([]string{"manifest", "push", "--compression-format=gzip", "--compression-level=2", "--tls-verify=false", "--creds=podmantest:wrongpasswd", "foo", "localhost:" + registry.Port + "/credstest"}) push = podmanTest.Podman([]string{"manifest", "push", "--compression-format=gzip", "--compression-level=2", "--tls-verify=false", "--creds=podmantest:wrongpasswd", "foo", "localhost:" + registry.Port + "/credstest"})
push.WaitWithDefaultTimeout() push.WaitWithDefaultTimeout()

1
test/e2e/push_test.go
View File

@ -114,7 +114,6 @@ var _ = Describe("Podman push", func() {
Expect(output).To(ContainSubstring("Copying blob ")) Expect(output).To(ContainSubstring("Copying blob "))
Expect(output).To(ContainSubstring("Copying config ")) Expect(output).To(ContainSubstring("Copying config "))
Expect(output).To(ContainSubstring("Writing manifest to image destination")) Expect(output).To(ContainSubstring("Writing manifest to image destination"))
Expect(output).To(ContainSubstring("Storing signatures"))
bitSize := 1024 bitSize := 1024
keyFileName := filepath.Join(podmanTest.TempDir, "key") keyFileName := filepath.Join(podmanTest.TempDir, "key")

2
test/system/010-images.bats
View File

@ -321,7 +321,7 @@ Deleted: $pauseID"
# Without -q: verbose output, but only on podman-local, not remote # Without -q: verbose output, but only on podman-local, not remote
run_podman commit my-container --format docker -m comment my-test-image1 run_podman commit my-container --format docker -m comment my-test-image1
if ! is_remote; then if ! is_remote; then
assert "$output" =~ "Getting image.*Writing manif.*Storing signatu" \ assert "$output" =~ "Getting image.*Writing manif" \
"Without -q, verbose output" "Without -q, verbose output"
fi fi

2
test/system/120-load.bats
View File

@ -116,7 +116,7 @@ verify_iid_and_name() {
# Copy it there. # Copy it there.
run_podman image scp $newname ${notme}@localhost:: run_podman image scp $newname ${notme}@localhost::
is "$output" "Copying blob .*Copying config.*Writing manifest.*Storing signatures" is "$output" "Copying blob .*Copying config.*Writing manifest"
# confirm that image was copied. FIXME: also try $PODMAN image inspect? # confirm that image was copied. FIXME: also try $PODMAN image inspect?
_sudo $PODMAN image exists $newname _sudo $PODMAN image exists $newname