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

vet fixes

Browse Source 
Signed-off-by: Jess Frazelle <me@jessfraz.com>
This commit is contained in:
Jess Frazelle
2016-08-15 14:02:47 -07:00
committed by Jess Frazelle
parent 3803fee972
commit d51962e1bb
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kubelet_test.go
View File

@@ -705,7 +705,7 @@ func TestValidateContainerLogStatus(t *testing.T) {
podStatus := &api.PodStatus{ContainerStatuses: tc.statuses}
_, err := kubelet.validateContainerLogStatus("podName", podStatus, containerName, previous)
if !tc.success {
assert.Error(t, err, "[case %d] error", i)
assert.Error(t, err, fmt.Sprintf("[case %d] error", i))
} else {
assert.NoError(t, err, "[case %d] error", i)
}
@@ -713,13 +713,13 @@ func TestValidateContainerLogStatus(t *testing.T) {
previous = true
_, err = kubelet.validateContainerLogStatus("podName", podStatus, containerName, previous)
if !tc.pSuccess {
assert.Error(t, err, "[case %d] error", i)
assert.Error(t, err, fmt.Sprintf("[case %d] error", i))
} else {
assert.NoError(t, err, "[case %d] error", i)
}
// Access the log of a container that's not in the pod
_, err = kubelet.validateContainerLogStatus("podName", podStatus, "blah", false)
assert.Error(t, err, "[case %d] invalid container name should cause an error", i)
assert.Error(t, err, fmt.Sprintf("[case %d] invalid container name should cause an error", i))
}
}