dfb8f2155a
In3f0d90a2a9we introduced a global signal handler and made sure all the contexts passed into command execution get (appropriately) cancelled when we get a SIGINT. Due to that change, and how we use this context during `docker attach`, we started to return the context cancelation error when a user signals the running `docker attach`. Since this is the intended behavior, we shouldn't return an error, so this commit adds checks to ignore this specific error in this case. Also adds a regression test. Signed-off-by: Laura Brehm <laurabrehm@hey.com> (cherry picked from commit66aa0f672c) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
55 lines
1.4 KiB
Go
55 lines
1.4 KiB
Go
package container
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/creack/pty"
|
|
"github.com/docker/cli/e2e/internal/fixtures"
|
|
"gotest.tools/v3/assert"
|
|
"gotest.tools/v3/icmd"
|
|
)
|
|
|
|
func TestAttachExitCode(t *testing.T) {
|
|
const exitCode = 21
|
|
result := icmd.RunCommand("docker", "run", "-d", "-i", "--rm", fixtures.AlpineImage, "sh", "-c", fmt.Sprintf("read; exit %d", exitCode))
|
|
result.Assert(t, icmd.Success)
|
|
|
|
containerID := strings.TrimSpace(result.Stdout())
|
|
|
|
result = icmd.RunCmd(icmd.Command("docker", "attach", containerID), withStdinNewline)
|
|
result.Assert(t, icmd.Expected{ExitCode: exitCode})
|
|
}
|
|
|
|
func withStdinNewline(cmd *icmd.Cmd) {
|
|
cmd.Stdin = strings.NewReader("\n")
|
|
}
|
|
|
|
// Regression test for https://github.com/docker/cli/issues/5294
|
|
func TestAttachInterrupt(t *testing.T) {
|
|
result := icmd.RunCommand("docker", "run", "-d", fixtures.AlpineImage, "sh", "-c", "sleep 5")
|
|
result.Assert(t, icmd.Success)
|
|
containerID := strings.TrimSpace(result.Stdout())
|
|
|
|
// run it as such so we can signal it later
|
|
c := exec.Command("docker", "attach", containerID)
|
|
d := bytes.Buffer{}
|
|
c.Stdout = &d
|
|
c.Stderr = &d
|
|
_, err := pty.Start(c)
|
|
assert.NilError(t, err)
|
|
|
|
// have to wait a bit to give time for the command to execute/print
|
|
time.Sleep(500 * time.Millisecond)
|
|
c.Process.Signal(os.Interrupt)
|
|
|
|
_ = c.Wait()
|
|
assert.Equal(t, c.ProcessState.ExitCode(), 0)
|
|
assert.Equal(t, d.String(), "")
|
|
}
|