Merge pull request #6924 from yujuhong/data_race

Fix data race in kubelet_test.go
This commit is contained in:
Dawn Chen 2015-04-16 11:56:40 -07:00
commit fa4363d493

View File

@ -139,7 +139,7 @@ func (f *FakeDockerClient) ListContainers(options docker.ListContainersOptions)
if options.All {
return append(f.ContainerList, f.ExitedContainerList...), err
}
return f.ContainerList, err
return append([]docker.APIContainers{}, f.ContainerList...), err
}
// InspectContainer is a test-spy implementation of DockerInterface.InspectContainer.