mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +00:00
839c2709af
The WithMockClient option was explicitly resetting the client's API version (see [1]), which differs from the regular client, which is initialized with the current API version used by the client (see [2]). This patch: - reduces the `WithMockClient` to only set the custom HTTP client, leaving other fields un-touched. - adds a test utility and updates tests to handle the API-version prefix - removes redundant uses of `WithVersion()` in tests; for most test-cases it was used to make sure a current API version is used that supports the feature being tested, but there was no test to verify the behavior for lower API versions, so we may as well test against "latest". [1]:5a582729d8/client/client_mock_test.go (L22-L36)[2]:5a582729d8/client/client.go (L167-L190)Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
106 lines
3.5 KiB
Go
106 lines
3.5 KiB
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"io"
|
|
"net/http"
|
|
"testing"
|
|
|
|
cerrdefs "github.com/containerd/errdefs"
|
|
"github.com/moby/moby/api/types/container"
|
|
"gotest.tools/v3/assert"
|
|
is "gotest.tools/v3/assert/cmp"
|
|
)
|
|
|
|
func TestContainerCommitError(t *testing.T) {
|
|
client, err := NewClientWithOpts(
|
|
WithMockClient(errorMock(http.StatusInternalServerError, "Server error")),
|
|
)
|
|
assert.NilError(t, err)
|
|
|
|
_, err = client.ContainerCommit(context.Background(), "nothing", ContainerCommitOptions{})
|
|
assert.Check(t, is.ErrorType(err, cerrdefs.IsInternal))
|
|
|
|
_, err = client.ContainerCommit(context.Background(), "", ContainerCommitOptions{})
|
|
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
|
|
assert.Check(t, is.ErrorContains(err, "value is empty"))
|
|
|
|
_, err = client.ContainerCommit(context.Background(), " ", ContainerCommitOptions{})
|
|
assert.Check(t, is.ErrorType(err, cerrdefs.IsInvalidArgument))
|
|
assert.Check(t, is.ErrorContains(err, "value is empty"))
|
|
}
|
|
|
|
func TestContainerCommit(t *testing.T) {
|
|
const (
|
|
expectedURL = "/commit"
|
|
expectedContainerID = "container_id"
|
|
specifiedReference = "repository_name:tag"
|
|
expectedRepositoryName = "docker.io/library/repository_name"
|
|
expectedTag = "tag"
|
|
expectedComment = "comment"
|
|
expectedAuthor = "author"
|
|
)
|
|
expectedChanges := []string{"change1", "change2"}
|
|
|
|
client, err := NewClientWithOpts(
|
|
WithMockClient(func(req *http.Request) (*http.Response, error) {
|
|
if err := assertRequest(req, http.MethodPost, expectedURL); err != nil {
|
|
return nil, err
|
|
}
|
|
query := req.URL.Query()
|
|
containerID := query.Get("container")
|
|
if containerID != expectedContainerID {
|
|
return nil, fmt.Errorf("container id not set in URL query properly. Expected '%s', got %s", expectedContainerID, containerID)
|
|
}
|
|
repo := query.Get("repo")
|
|
if repo != expectedRepositoryName {
|
|
return nil, fmt.Errorf("container repo not set in URL query properly. Expected '%s', got %s", expectedRepositoryName, repo)
|
|
}
|
|
tag := query.Get("tag")
|
|
if tag != expectedTag {
|
|
return nil, fmt.Errorf("container tag not set in URL query properly. Expected '%s', got %s'", expectedTag, tag)
|
|
}
|
|
comment := query.Get("comment")
|
|
if comment != expectedComment {
|
|
return nil, fmt.Errorf("container comment not set in URL query properly. Expected '%s', got %s'", expectedComment, comment)
|
|
}
|
|
author := query.Get("author")
|
|
if author != expectedAuthor {
|
|
return nil, fmt.Errorf("container author not set in URL query properly. Expected '%s', got %s'", expectedAuthor, author)
|
|
}
|
|
pause := query.Get("pause")
|
|
if pause != "0" {
|
|
return nil, fmt.Errorf("container pause not set in URL query properly. Expected 'true', got %v'", pause)
|
|
}
|
|
changes := query["changes"]
|
|
if len(changes) != len(expectedChanges) {
|
|
return nil, fmt.Errorf("expected container changes size to be '%d', got %d", len(expectedChanges), len(changes))
|
|
}
|
|
b, err := json.Marshal(container.CommitResponse{
|
|
ID: "new_container_id",
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &http.Response{
|
|
StatusCode: http.StatusOK,
|
|
Body: io.NopCloser(bytes.NewReader(b)),
|
|
}, nil
|
|
}),
|
|
)
|
|
assert.NilError(t, err)
|
|
|
|
r, err := client.ContainerCommit(context.Background(), expectedContainerID, ContainerCommitOptions{
|
|
Reference: specifiedReference,
|
|
Comment: expectedComment,
|
|
Author: expectedAuthor,
|
|
Changes: expectedChanges,
|
|
Pause: false,
|
|
})
|
|
assert.NilError(t, err)
|
|
assert.Check(t, is.Equal(r.ID, "new_container_id"))
|
|
}
|