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

Merge pull request #47408 from shiywang/follow-go-code-style

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47416, 47408, 49697, 49860, 50162)

follow our go code style: error->err

Fixes https://github.com/kubernetes/kubernetes/issues/50189
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-08-05 03:22:54 -07:00
committed by GitHub
parent 58819b0204 9a96ff94af
commit fa5877de18
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kuberuntime/helpers_test.go
View File

@@ -194,8 +194,8 @@ func TestGetImageUser(t *testing.T) {
i.Images[test.originalImage.name].Username = test.originalImage.username
i.Images[test.originalImage.name].Uid = test.originalImage.uid
uid, username, error := m.getImageUser(test.originalImage.name)
assert.NoError(t, error, "TestCase[%d]", j)
uid, username, err := m.getImageUser(test.originalImage.name)
assert.NoError(t, err, "TestCase[%d]", j)
if test.expectedImageUserValues.uid == (*int64)(nil) {
assert.Equal(t, test.expectedImageUserValues.uid, uid, "TestCase[%d]", j)