From 2c0cd36ba41a502e04321bd0e39bc4b383aa22e6 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Mon, 26 Jun 2023 15:28:13 +0200 Subject: [PATCH] tests: fix "Storing signatures" check 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 --- pkg/bindings/test/images_test.go | 1 - test/e2e/manifest_test.go | 1 - test/e2e/push_test.go | 1 - test/system/120-load.bats | 2 +- 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index 2580d14e03..feb5dd4b58 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -400,7 +400,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() { diff --git a/test/e2e/manifest_test.go b/test/e2e/manifest_test.go index 5288e13981..900ee4d42c 100644 --- a/test/e2e/manifest_test.go +++ b/test/e2e/manifest_test.go @@ -445,7 +445,6 @@ var _ = Describe("Podman manifest", 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")) push = podmanTest.Podman([]string{"manifest", "push", "--tls-verify=false", "--creds=podmantest:wrongpasswd", "foo", "localhost:" + registry.Port + "/credstest"}) push.WaitWithDefaultTimeout() diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go index e54ebf26e5..a4b40d13d0 100644 --- a/test/e2e/push_test.go +++ b/test/e2e/push_test.go @@ -124,7 +124,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") diff --git a/test/system/120-load.bats b/test/system/120-load.bats index 35a6eae421..fc323f1e6a 100644 --- a/test/system/120-load.bats +++ b/test/system/120-load.bats @@ -113,7 +113,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