From c40eaa2423e06988b1885f6cc06b7c6d5d4b8a9c Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 29 Mar 2023 16:30:16 +0200 Subject: [PATCH] test/e2e: gpg keep stdout/err attached By default go will not keep the stdout/err attach when executing commands via exec.Command(). It is required to explicitly pass the current stdout/err fds down to the child so we can see the error output in the logs to debug #17966. Signed-off-by: Paul Holzinger --- test/e2e/image_sign_test.go | 4 ++++ test/e2e/save_test.go | 2 ++ 2 files changed, 6 insertions(+) diff --git a/test/e2e/image_sign_test.go b/test/e2e/image_sign_test.go index f319134263..76d6c91e10 100644 --- a/test/e2e/image_sign_test.go +++ b/test/e2e/image_sign_test.go @@ -46,6 +46,8 @@ var _ = Describe("Podman image sign", func() { It("podman sign image", func() { cmd := exec.Command("gpg", "--import", "sign/secret-key.asc") + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr err := cmd.Run() Expect(err).ToNot(HaveOccurred()) sigDir := filepath.Join(podmanTest.TempDir, "test-sign") @@ -60,6 +62,8 @@ var _ = Describe("Podman image sign", func() { It("podman sign --all multi-arch image", func() { cmd := exec.Command("gpg", "--import", "sign/secret-key.asc") + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr err := cmd.Run() Expect(err).ToNot(HaveOccurred()) sigDir := filepath.Join(podmanTest.TempDir, "test-sign-multi") diff --git a/test/e2e/save_test.go b/test/e2e/save_test.go index 17da7c23f5..c792920278 100644 --- a/test/e2e/save_test.go +++ b/test/e2e/save_test.go @@ -171,6 +171,8 @@ var _ = Describe("Podman save", func() { } cmd := exec.Command("gpg", "--import", "sign/secret-key.asc") + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr err = cmd.Run() Expect(err).ToNot(HaveOccurred())