Skip to content

Commit

Permalink
tests: fix "Storing signatures" check
Browse files Browse the repository at this point in the history
After[1] c/image no longer prints "Storing signatures" so we should
not check for it.

[1] containers/image#2001

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
  • Loading branch information
Luap99 committed Jun 27, 2023
1 parent b80fd54 commit 6eaf8a2
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion pkg/bindings/test/images_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,6 @@ var _ = Describe("Podman images", func() {
Expect(output).To(ContainSubstring("Copying blob "))
Expect(output).To(ContainSubstring("Copying config "))
Expect(output).To(ContainSubstring("Writing manifest to image destination"))
Expect(output).To(ContainSubstring("Storing signatures"))
})

It("Build no options", func() {
Expand Down
1 change: 0 additions & 1 deletion test/e2e/manifest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@ RUN touch /file
Expect(output).To(ContainSubstring("Copying blob "))
Expect(output).To(ContainSubstring("Copying config "))
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.WaitWithDefaultTimeout()
Expand Down
1 change: 0 additions & 1 deletion test/e2e/push_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ var _ = Describe("Podman push", func() {
Expect(output).To(ContainSubstring("Copying blob "))
Expect(output).To(ContainSubstring("Copying config "))
Expect(output).To(ContainSubstring("Writing manifest to image destination"))
Expect(output).To(ContainSubstring("Storing signatures"))

bitSize := 1024
keyFileName := filepath.Join(podmanTest.TempDir, "key")
Expand Down
2 changes: 1 addition & 1 deletion test/system/010-images.bats
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ Deleted: $pauseID"
# Without -q: verbose output, but only on podman-local, not remote
run_podman commit my-container --format docker -m comment my-test-image1
if ! is_remote; then
assert "$output" =~ "Getting image.*Writing manif.*Storing signatu" \
assert "$output" =~ "Getting image.*Writing manif" \
"Without -q, verbose output"
fi

Expand Down
2 changes: 1 addition & 1 deletion test/system/120-load.bats
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ verify_iid_and_name() {

# Copy it there.
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?
_sudo $PODMAN image exists $newname
Expand Down

0 comments on commit 6eaf8a2

Please sign in to comment.