Merge pull request kubernetes#73990 from xichengliudui/fixlinterror

k8s-ci-robot · web-flow · commit bf20886f4ea6 · 2019-02-14T22:43:15.000-08:00
Fix golint failures pkg/kubelet/util/cache
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -225,7 +225,6 @@ pkg/kubelet/status/testing
 pkg/kubelet/sysctl
 pkg/kubelet/types
 pkg/kubelet/util
-pkg/kubelet/util/cache
 pkg/kubelet/util/pluginwatcher
 pkg/kubelet/util/queue
 pkg/kubelet/util/sliceutils
diff --git a/pkg/kubelet/util/cache/object_cache.go b/pkg/kubelet/util/cache/object_cache.go
@@ -75,6 +75,7 @@ func (c *ObjectCache) Get(key string) (interface{}, error) {
 	return value.(objectEntry).obj, nil
 }
 
+// Add adds objectEntry by using a unique string as the key.
 func (c *ObjectCache) Add(key string, obj interface{}) error {
 	err := c.cache.Add(objectEntry{key: key, obj: obj})
 	if err != nil {
diff --git a/pkg/kubelet/util/cache/object_cache_test.go b/pkg/kubelet/util/cache/object_cache_test.go
@@ -46,7 +46,7 @@ func TestAddAndGet(t *testing.T) {
 		val: "bar",
 	}
 	objectCache := NewFakeObjectCache(func() (interface{}, error) {
-		return nil, fmt.Errorf("Unexpected Error: updater should never be called in this test!")
+		return nil, fmt.Errorf("Unexpected Error: updater should never be called in this test")
 	}, 1*time.Hour, clock.NewFakeClock(time.Now()))
 
 	err := objectCache.Add(testObj.key, testObj.val)

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ func (c *ObjectCache) Get(key string) (interface{}, error) {`
`75`	`75`	`return value.(objectEntry).obj, nil`
`76`	`76`	`}`
`77`	`77`
	`78`	`+// Add adds objectEntry by using a unique string as the key.`
`78`	`79`	`func (c *ObjectCache) Add(key string, obj interface{}) error {`
`79`	`80`	`err := c.cache.Add(objectEntry{key: key, obj: obj})`
`80`	`81`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func TestAddAndGet(t *testing.T) {`
`46`	`46`	`val: "bar",`
`47`	`47`	`}`
`48`	`48`	`objectCache := NewFakeObjectCache(func() (interface{}, error) {`
`49`		`- return nil, fmt.Errorf("Unexpected Error: updater should never be called in this test!")`
	`49`	`+ return nil, fmt.Errorf("Unexpected Error: updater should never be called in this test")`
`50`	`50`	`}, 1*time.Hour, clock.NewFakeClock(time.Now()))`
`51`	`51`
`52`	`52`	`err := objectCache.Add(testObj.key, testObj.val)`