prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1504 from dashpole/go_vet_fix

Browse Source 
fixed go vet bug
This commit is contained in:
Tim St. Clair 2016-10-19 15:01:07 -07:00 committed by GitHub
commit 49659347aa
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manager/manager_test.go
View File

@ -115,7 +115,7 @@ func expectManagerWithContainers(containers []string, query *info.ContainerInfoR
h.On("GetSpec").Return(
spec,
nil,
)
).Once()
handlerMap[h.Name] = h
},
t,
@ -216,10 +216,9 @@ func TestGetContainerInfoV2Failure(t *testing.T) {
// Make GetSpec fail on /c2
mockErr := fmt.Errorf("intentional GetSpec failure")
failingHandler := containertest.NewMockContainerHandler(failing)
failingHandler.On("GetSpec").Return(info.ContainerSpec{}, mockErr)
failingHandler.On("Exists").Return(true)
*handlerMap[failing] = *failingHandler
handlerMap[failing].GetSpec() // Use up default GetSpec call, and replace below
handlerMap[failing].On("GetSpec").Return(info.ContainerSpec{}, mockErr)
handlerMap[failing].On("Exists").Return(true)
m.containers[namespacedContainerName{Name: failing}].lastUpdatedTime = time.Time{} // Force GetSpec.
infos, err := m.GetContainerInfoV2("/", options)