Skip to content

e2e: TestSigProxyWithTTY increase timeout #1991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
thaJeztah wants to merge 5 commits into from
Closed

e2e: TestSigProxyWithTTY increase timeout #1991

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba3d3d8
TestSigProxyWithTTY: fix
kolyshkin Jul 24, 2019
19a53d6
e2e: TestSigProxyWithTTY increase timeout
thaJeztah Jul 10, 2019
4973f02
Debug some output if things fail
thaJeztah Jul 29, 2019
b80b170
explicitly use docker container inspect
thaJeztah Jul 29, 2019
9fac942
Bigger, better, faster, stronger
thaJeztah Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions e2e/container/proxy_signal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,38 +19,45 @@ import (
func TestSigProxyWithTTY(t *testing.T) {
_, tty, err := pty.Open()
assert.NilError(t, err, "could not open pty")
defer func() { _ = tty.Close() }()

containerName := "repro-28872"
cmd := exec.Command("docker", "run", "-i", "-t", "--init", "--name", containerName, fixtures.BusyboxImage, "sleep", "30")
cmd := exec.Command("docker", "run", "-i", "-t", "--init", "--name", containerName, fixtures.BusyboxImage, "sleep", "300")
cmd.Stdin = tty
cmd.Stdout = tty
cmd.Stderr = tty
defer func() {
_ = cmd.Wait()
_ = tty.Close()
}()

err = cmd.Start()
out, _ := cmd.CombinedOutput()
assert.NilError(t, err, "failed to start container: %s", out)
assert.NilError(t, err, "failed to start container")
defer icmd.RunCommand("docker", "container", "rm", "-f", containerName)

poll.WaitOn(t, containerExistsWithStatus(t, containerName, "running"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(5*time.Second))
poll.WaitOn(t, containerExistsWithStatus(t, containerName, "running"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(20*time.Second))

pid := cmd.Process.Pid
t.Logf("terminating PID %d", pid)
err = syscall.Kill(pid, syscall.SIGTERM)
assert.NilError(t, err)

poll.WaitOn(t, containerExistsWithStatus(t, containerName, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(5*time.Second))
poll.WaitOn(t, containerExistsWithStatus(t, containerName, "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(20*time.Second))
}

func containerExistsWithStatus(t *testing.T, containerID, status string) func(poll.LogT) poll.Result {
return func(poll.LogT) poll.Result {
result := icmd.RunCommand("docker", "inspect", "-f", "{{ .State.Status }}", containerID)
result := icmd.RunCommand("docker", "container", "inspect", "-f", "{{ .State.Status }}", containerID)
// ignore initial failures as the container may not yet exist (i.e., don't result.Assert(t, icmd.Success))

actual := strings.TrimSpace(result.Stdout())
if actual == status {
return poll.Success()
}
if result.Error != nil {
t.Log(result.Error)
}
t.Log(result.Stderr())
t.Log(result.Stdout())
return poll.Continue("expected status %s != %s", status, actual)
}
}