diff --git a/e2e/container/proxy_signal_test.go b/e2e/container/proxy_signal_test.go index c6d801199f..d6a5853798 100644 --- a/e2e/container/proxy_signal_test.go +++ b/e2e/container/proxy_signal_test.go @@ -26,17 +26,17 @@ func TestSigProxyWithTTY(t *testing.T) { assert.NilError(t, err, "failed to start container") defer icmd.RunCommand("docker", "container", "rm", "-f", t.Name()) - poll.WaitOn(t, containerExistsWithStatus(t, t.Name(), "running"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(5*time.Second)) + poll.WaitOn(t, containerExistsWithStatus(t.Name(), "running"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(5*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, t.Name(), "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(5*time.Second)) + poll.WaitOn(t, containerExistsWithStatus(t.Name(), "exited"), poll.WithDelay(100*time.Millisecond), poll.WithTimeout(5*time.Second)) } -func containerExistsWithStatus(t *testing.T, containerID, status string) func(poll.LogT) poll.Result { +func containerExistsWithStatus(containerID, status string) func(poll.LogT) poll.Result { return func(poll.LogT) poll.Result { result := icmd.RunCommand("docker", "inspect", "-f", "{{ .State.Status }}", containerID) // ignore initial failures as the container may not yet exist (i.e., don't result.Assert(t, icmd.Success))