github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix rebase issues.

Browse Source
This commit is contained in:
Dawn Chen 2014-10-03 12:12:17 -07:00
parent 8d0ed93aa1
commit 39f648bda2
3 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/dockertools/docker.go
View File

@ -44,7 +44,6 @@ type DockerContainerData struct {
type DockerInterface interface { type DockerInterface interface {
ListContainers(options docker.ListContainersOptions) ([]docker.APIContainers, error) ListContainers(options docker.ListContainersOptions) ([]docker.APIContainers, error)
InspectContainer(id string) (*docker.Container, error) InspectContainer(id string) (*docker.Container, error)
InspectImage(name string) (*docker.Image, error)
CreateContainer(docker.CreateContainerOptions) (*docker.Container, error) CreateContainer(docker.CreateContainerOptions) (*docker.Container, error)
StartContainer(id string, hostConfig *docker.HostConfig) error StartContainer(id string, hostConfig *docker.HostConfig) error
StopContainer(id string, timeout uint) error StopContainer(id string, timeout uint) error

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

@ -140,10 +140,6 @@ func (f *FakeDockerClient) PullImage(opts docker.PullImageOptions, auth docker.A
return f.Err return f.Err
} }
func (f *FakeDockerClient) InspectImage(name string) (*docker.Image, error) {
return nil, f.Err
}
// FakeDockerPuller is a stub implementation of DockerPuller. // FakeDockerPuller is a stub implementation of DockerPuller.
type FakeDockerPuller struct { type FakeDockerPuller struct {
sync.Mutex sync.Mutex

2
pkg/kubelet/kubelet_test.go
View File

@ -273,7 +273,7 @@ func TestSyncPodsCreatesNetAndContainerPullsImage(t *testing.T) {
kubelet.drainWorkers() kubelet.drainWorkers()
verifyCalls(t, fakeDocker, []string{ verifyCalls(t, fakeDocker, []string{
"list", "list", "create", "start", "list", "inspect", "list", "create", "start"}) "list", "list", "create", "start", "list", "inspect_container", "list", "create", "start"})
fakeDocker.Lock() fakeDocker.Lock()