github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #70983 from xichengliudui/fix18111302 

Delete some redundant code
pull/564/head
Kubernetes Prow Robot 2018-12-06 19:03:08 -08:00 committed by GitHub
parent a5887009fc 9a25d46e8b
commit b703016614
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/client-go/rest/request.go
View File

@ -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)
}

5
staging/src/k8s.io/client-go/rest/request_test.go
View File

@ -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)