github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6924 from yujuhong/data_race

Browse Source 
Fix data race in kubelet_test.go
This commit is contained in:
Dawn Chen 2015-04-16 11:56:40 -07:00
commit fa4363d493
1 changed files with 1 additions and 1 deletions
Show Stats 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.