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

Fix data race in kubelet_test.go

Browse Source 
Ensure that FakeDockerClient make a copy of the internal list and return it.
This commit is contained in:
Yu-Ju Hong
2015-04-16 10:51:33 -07:00
parent 902e1196ac
commit 2fd87597a4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -139,7 +139,7 @@ func (f *FakeDockerClient) ListContainers(options docker.ListContainersOptions)
if options.All { if options.All {
return append(f.ContainerList, f.ExitedContainerList...), err 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. // InspectContainer is a test-spy implementation of DockerInterface.InspectContainer.