github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor Info and Version.

Browse Source
This commit is contained in:
Random-Liu
2016-04-17 21:27:39 -07:00
parent d33b69a0de
commit d981fee2ee
7 changed files with 99 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/dockertools/fake_docker_client.go
View File

@@ -50,8 +50,8 @@ type FakeDockerClient struct {
Stopped []string
Removed []string
RemovedImages sets.String
VersionInfo docker.Env
Information docker.Env
VersionInfo dockertypes.Version
Information dockertypes.Info
ExecInspect *dockertypes.ContainerExecInspect
execCmd []string
EnableSleep bool
@@ -67,7 +67,7 @@ func NewFakeDockerClient() *FakeDockerClient {
func NewFakeDockerClientWithVersion(version, apiVersion string) *FakeDockerClient {
return &FakeDockerClient{
VersionInfo: docker.Env{fmt.Sprintf("Version=%s", version), fmt.Sprintf("ApiVersion=%s", apiVersion)},
VersionInfo: dockertypes.Version{Version: version, APIVersion: apiVersion},
Errors: make(map[string]error),
RemovedImages: sets.String{},
ContainerMap: make(map[string]*dockertypes.ContainerJSON),
@@ -437,13 +437,13 @@ func (f *FakeDockerClient) PullImage(opts docker.PullImageOptions, auth docker.A
return err
}
func (f *FakeDockerClient) Version() (*docker.Env, error) {
func (f *FakeDockerClient) Version() (*dockertypes.Version, error) {
f.Lock()
defer f.Unlock()
return &f.VersionInfo, f.popError("version")
}
func (f *FakeDockerClient) Info() (*docker.Env, error) {
func (f *FakeDockerClient) Info() (*dockertypes.Info, error) {
return &f.Information, nil
}