Fix incorrect if conditions and add test case

This commit is contained in:
xiangpengzhao 2016-07-18 03:02:02 -04:00
parent cb6f8f2ce9
commit c51346e5cc
2 changed files with 33 additions and 1 deletions

View File

@ -1434,7 +1434,7 @@ var errNoPodOnContainer = fmt.Errorf("no pod information labels on Docker contai
// containerAndPodFromLabels tries to load the appropriate container info off of a Docker container's labels
func containerAndPodFromLabels(inspect *dockertypes.ContainerJSON) (pod *api.Pod, container *api.Container, err error) {
if inspect == nil && inspect.Config == nil && inspect.Config.Labels == nil {
if inspect == nil || inspect.Config == nil || inspect.Config.Labels == nil {
return nil, nil, errNoPodOnContainer
}
labels := inspect.Config.Labels

View File

@ -2305,3 +2305,35 @@ func TestSyncPodGetsPodIPFromNetworkPlugin(t *testing.T) {
"create", "start", "inspect_container",
})
}
// only test conditions "if inspect == nil || inspect.Config == nil || inspect.Config.Labels == nil" now
func TestContainerAndPodFromLabels(t *testing.T) {
tests := []struct {
inspect *dockertypes.ContainerJSON
expectedError error
}{
{
inspect: nil,
expectedError: errNoPodOnContainer,
},
{
inspect: &dockertypes.ContainerJSON{},
expectedError: errNoPodOnContainer,
},
{
inspect: &dockertypes.ContainerJSON{
Config: &dockercontainer.Config{
Hostname: "foo",
},
},
expectedError: errNoPodOnContainer,
},
}
for k, v := range tests {
pod, container, err := containerAndPodFromLabels(v.inspect)
if pod != nil || container != nil || err != v.expectedError {
t.Errorf("case[%q]: expected: nil, nil, %v, got: %v, %v, %v", k, v.expectedError, pod, container, err)
}
}
}