Merge pull request #70983 from xichengliudui/fix18111302

Delete some redundant code

Merge pull request #70983 from xichengliudui/fix18111302
b7030166 · Kubernetes Prow Robot · GitHub · a5887009 · 9a25d46e · b7030166
Unverified Commit b7030166 authored Dec 06, 2018 by Kubernetes Prow Robot Committed by GitHub Dec 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

request.go staging/src/k8s.io/client-go/rest/request.go +1 -2

request_test.go staging/src/k8s.io/client-go/rest/request_test.go +2 -3

No files found.
--- a/staging/src/k8s.io/client-go/rest/request.go
+++ b/staging/src/k8s.io/client-go/rest/request.go
@@ -1195,7 +1195,6 @@ func IsValidPathSegmentPrefix(name string) []string {
 func ValidatePathSegmentName(name string, prefix bool) []string {
 	if prefix {
 		return IsValidPathSegmentPrefix(name)
-	} else {
-		return IsValidPathSegmentName(name)
 	}
+	return IsValidPathSegmentName(name)
 }
--- a/staging/src/k8s.io/client-go/rest/request_test.go
+++ b/staging/src/k8s.io/client-go/rest/request_test.go
@@ -1218,10 +1218,9 @@ func TestBackoffLifecycle(t *testing.T) {
 		if count == 5 || count == 9 {
 			w.WriteHeader(http.StatusOK)
 			return
-		} else {
-			w.WriteHeader(http.StatusGatewayTimeout)
-			return
 		}
+		w.WriteHeader(http.StatusGatewayTimeout)
+		return
 	}))
 	defer testServer.Close()
 	c := testRESTClient(t, testServer)