0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #30653 from vipconsult/28766-fix-checkpoint-ls-error-messages

Browse source 
more descriptive error for checkpoint ls  for non existent containers
This commit is contained in:
Vincent Demeester 2017-02-02 14:41:53 +01:00 committed by GitHub
commit 31f1ff029f
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/checkpoint_list.go
View file

@ -2,6 +2,7 @@ package client
import (
"encoding/json"
"net/http"
"net/url"
"github.com/docker/docker/api/types"
@ -19,6 +20,9 @@ func (cli *Client) CheckpointList(ctx context.Context, container string, options
resp, err := cli.get(ctx, "/containers/"+container+"/checkpoints", query, nil)
if err != nil {
if resp.statusCode == http.StatusNotFound {
return checkpoints, containerNotFoundError{container}
}
return checkpoints, err
}

11
client/checkpoint_list_test.go
View file

@ -55,3 +55,14 @@ func TestCheckpointList(t *testing.T) {
t.Fatalf("expected 1 checkpoint, got %v", checkpoints)
}
}
func TestCheckpointListContainerNotFound(t *testing.T) {
client := &Client{
client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
}
_, err := client.CheckpointList(context.Background(), "unknown", types.CheckpointListOptions{})
if err == nil || !IsErrContainerNotFound(err) {
t.Fatalf("expected a containerNotFound error, got %v", err)
}
}