8b83e09b9c
Repro steps:
- Run Docker Desktop
- Run `docker run busybox tail -f /dev/null`
- Run `pkill "Docker Desktop"
Expected:
An error message that indicates that Docker Desktop is shutting down.
Actual:
An error message that looks like this:
```
error waiting for container: invalid character 's' looking for beginning of value
```
here's an example:
https://github.com/docker/for-mac/issues/6575#issuecomment-1324879001
After this change, you get an error message like:
```
error waiting for container: copying response body from Docker: unexpected EOF
```
which is a bit more explicit.
Signed-off-by: Nick Santos <nick.santos@docker.com>
(cherry picked from commit 9900c7a348
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
129 lines
3.6 KiB
Go
129 lines
3.6 KiB
Go
package client // import "github.com/docker/docker/client"
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"log"
|
|
"net/http"
|
|
"strings"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types/container"
|
|
"github.com/docker/docker/errdefs"
|
|
)
|
|
|
|
func TestContainerWaitError(t *testing.T) {
|
|
client := &Client{
|
|
client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
|
|
}
|
|
resultC, errC := client.ContainerWait(context.Background(), "nothing", "")
|
|
select {
|
|
case result := <-resultC:
|
|
t.Fatalf("expected to not get a wait result, got %d", result.StatusCode)
|
|
case err := <-errC:
|
|
if !errdefs.IsSystem(err) {
|
|
t.Fatalf("expected a Server Error, got %[1]T: %[1]v", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestContainerWait(t *testing.T) {
|
|
expectedURL := "/containers/container_id/wait"
|
|
client := &Client{
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if !strings.HasPrefix(req.URL.Path, expectedURL) {
|
|
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
|
|
}
|
|
b, err := json.Marshal(container.WaitResponse{
|
|
StatusCode: 15,
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: io.NopCloser(bytes.NewReader(b)),
|
|
}, nil
|
|
}),
|
|
}
|
|
|
|
resultC, errC := client.ContainerWait(context.Background(), "container_id", "")
|
|
select {
|
|
case err := <-errC:
|
|
t.Fatal(err)
|
|
case result := <-resultC:
|
|
if result.StatusCode != 15 {
|
|
t.Fatalf("expected a status code equal to '15', got %d", result.StatusCode)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestContainerWaitProxyInterrupt(t *testing.T) {
|
|
expectedURL := "/v1.30/containers/container_id/wait"
|
|
msg := "copying response body from Docker: unexpected EOF"
|
|
client := &Client{
|
|
version: "1.30",
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if !strings.HasPrefix(req.URL.Path, expectedURL) {
|
|
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: io.NopCloser(strings.NewReader(msg)),
|
|
}, nil
|
|
}),
|
|
}
|
|
|
|
resultC, errC := client.ContainerWait(context.Background(), "container_id", "")
|
|
select {
|
|
case err := <-errC:
|
|
if !strings.Contains(err.Error(), msg) {
|
|
t.Fatalf("Expected: %s, Actual: %s", msg, err.Error())
|
|
}
|
|
case result := <-resultC:
|
|
t.Fatalf("Unexpected result: %v", result)
|
|
}
|
|
}
|
|
|
|
func TestContainerWaitProxyInterruptLong(t *testing.T) {
|
|
expectedURL := "/v1.30/containers/container_id/wait"
|
|
msg := strings.Repeat("x", containerWaitErrorMsgLimit*5)
|
|
client := &Client{
|
|
version: "1.30",
|
|
client: newMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if !strings.HasPrefix(req.URL.Path, expectedURL) {
|
|
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: io.NopCloser(strings.NewReader(msg)),
|
|
}, nil
|
|
}),
|
|
}
|
|
|
|
resultC, errC := client.ContainerWait(context.Background(), "container_id", "")
|
|
select {
|
|
case err := <-errC:
|
|
// LimitReader limiting isn't exact, because of how the Readers do chunking.
|
|
if len(err.Error()) > containerWaitErrorMsgLimit*2 {
|
|
t.Fatalf("Expected error to be limited around %d, actual length: %d", containerWaitErrorMsgLimit, len(err.Error()))
|
|
}
|
|
case result := <-resultC:
|
|
t.Fatalf("Unexpected result: %v", result)
|
|
}
|
|
}
|
|
|
|
func ExampleClient_ContainerWait_withTimeout() {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
|
defer cancel()
|
|
|
|
client, _ := NewClientWithOpts(FromEnv)
|
|
_, errC := client.ContainerWait(ctx, "container_id", "")
|
|
if err := <-errC; err != nil {
|
|
log.Fatal(err)
|
|
}
|
|
}
|