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 <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2023-03-29 16:30:16 +02:00
parent d29a85b80e
commit c40eaa2423
2 changed files with 6 additions and 0 deletions

View File

@ -46,6 +46,8 @@ var _ = Describe("Podman image sign", func() {
It("podman sign image", func() { It("podman sign image", func() {
cmd := exec.Command("gpg", "--import", "sign/secret-key.asc") cmd := exec.Command("gpg", "--import", "sign/secret-key.asc")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Run() err := cmd.Run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
sigDir := filepath.Join(podmanTest.TempDir, "test-sign") 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() { It("podman sign --all multi-arch image", func() {
cmd := exec.Command("gpg", "--import", "sign/secret-key.asc") cmd := exec.Command("gpg", "--import", "sign/secret-key.asc")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err := cmd.Run() err := cmd.Run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
sigDir := filepath.Join(podmanTest.TempDir, "test-sign-multi") sigDir := filepath.Join(podmanTest.TempDir, "test-sign-multi")

View File

@ -171,6 +171,8 @@ var _ = Describe("Podman save", func() {
} }
cmd := exec.Command("gpg", "--import", "sign/secret-key.asc") cmd := exec.Command("gpg", "--import", "sign/secret-key.asc")
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
err = cmd.Run() err = cmd.Run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())