Merge pull request #14595 from yujuhong/rm_containerlist

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-09-28 19:54:32 -07:00
commit d11aec9217

View File

@ -33,7 +33,6 @@ type FakeRuntime struct {
sync.Mutex
CalledFunctions []string
PodList []*Pod
ContainerList []*Container
ImageList []Image
PodStatus api.PodStatus
StartedPods []string
@ -88,7 +87,6 @@ func (f *FakeRuntime) ClearCalls() {
f.CalledFunctions = []string{}
f.PodList = []*Pod{}
f.ContainerList = []*Container{}
f.PodStatus = api.PodStatus{}
f.StartedPods = []string{}
f.KilledPods = []string{}
@ -219,14 +217,6 @@ func (f *FakeRuntime) GetPodStatus(*api.Pod) (*api.PodStatus, error) {
return &status, f.Err
}
func (f *FakeRuntime) GetContainers(all bool) ([]*Container, error) {
f.Lock()
defer f.Unlock()
f.CalledFunctions = append(f.CalledFunctions, "GetContainers")
return f.ContainerList, f.Err
}
func (f *FakeRuntime) ExecInContainer(containerID string, cmd []string, stdin io.Reader, stdout, stderr io.WriteCloser, tty bool) error {
f.Lock()
defer f.Unlock()