Merge pull request #46667 from zhangxiaoyu-zidif/delete-meaningless-check

Automatic merge from submit-queue (batch tested with PRs 47958, 46261, 46667, 47709, 47579) Delete meaningless err check **What this PR does / why we need it**: Delete meaningless err check We don't need to care about err check. In cited function, if err is not nil, I return t.Errorf directly. So it does not matter that whether data is nil or err is nil. **Release note**: ```release-note\ NONE ```

Merge pull request #46667 from zhangxiaoyu-zidif/delete-meaningless-check
d84dedd1 · Kubernetes Submit Queue · GitHub · 4d9522f8 · d9652e86 · d84dedd1
Commit d84dedd1 authored Jun 23, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

schema_test.go pkg/api/validation/schema_test.go +1 -4

No files found.
--- a/pkg/api/validation/schema_test.go
+++ b/pkg/api/validation/schema_test.go
@@ -38,10 +38,7 @@ import (

 func readPod(filename string) ([]byte, error) {
 	data, err := ioutil.ReadFile("testdata/" + api.Registry.GroupOrDie(api.GroupName).GroupVersion.Version + "/" + filename)
-	if err != nil {
-		return nil, err
-	}
-	return data, nil
+	return data, err
 }

 func readSwaggerFile() ([]byte, error) {