github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79819 from yasongxu/fix-staging-file-lint

Browse Source 
staging file fix lint error: receiver name should not be an underscor…
This commit is contained in:
Kubernetes Prow Robot 2019-07-09 03:10:28 -07:00 committed by GitHub
commit c36e1493a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/apimachinery/pkg/util/intstr/intstr.go
View File

@ -122,11 +122,11 @@ func (intstr IntOrString) MarshalJSON() ([]byte, error) {
// the OpenAPI spec of this type. // the OpenAPI spec of this type.
// //
// See: https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators // See: https://github.com/kubernetes/kube-openapi/tree/master/pkg/generators
func (_ IntOrString) OpenAPISchemaType() []string { return []string{"string"} } func (IntOrString) OpenAPISchemaType() []string { return []string{"string"} }
// OpenAPISchemaFormat is used by the kube-openapi generator when constructing // OpenAPISchemaFormat is used by the kube-openapi generator when constructing
// the OpenAPI spec of this type. // the OpenAPI spec of this type.
func (_ IntOrString) OpenAPISchemaFormat() string { return "int-or-string" } func (IntOrString) OpenAPISchemaFormat() string { return "int-or-string" }
func (intstr *IntOrString) Fuzz(c fuzz.Continue) { func (intstr *IntOrString) Fuzz(c fuzz.Continue) {
if intstr == nil { if intstr == nil {

14
staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
View File

@ -3989,7 +3989,7 @@ func TestCreateInvokeAdmissionControl(t *testing.T) {
} }
} }
func expectApiStatus(t *testing.T, method, url string, data []byte, code int) *metav1.Status { func expectAPIStatus(t *testing.T, method, url string, data []byte, code int) *metav1.Status {
t.Helper() t.Helper()
client := http.Client{} client := http.Client{}
request, err := http.NewRequest(method, url, bytes.NewBuffer(data)) request, err := http.NewRequest(method, url, bytes.NewBuffer(data))
@ -4024,7 +4024,7 @@ func TestDelayReturnsError(t *testing.T) {
server := httptest.NewServer(handler) server := httptest.NewServer(handler)
defer server.Close() defer server.Close()
status := expectApiStatus(t, "DELETE", fmt.Sprintf("%s/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/foo/bar", server.URL), nil, http.StatusConflict) status := expectAPIStatus(t, "DELETE", fmt.Sprintf("%s/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/foo/bar", server.URL), nil, http.StatusConflict)
if status.Status != metav1.StatusFailure || status.Message == "" || status.Details == nil || status.Reason != metav1.StatusReasonAlreadyExists { if status.Status != metav1.StatusFailure || status.Message == "" || status.Details == nil || status.Reason != metav1.StatusReasonAlreadyExists {
t.Errorf("Unexpected status %#v", status) t.Errorf("Unexpected status %#v", status)
} }
@ -4055,7 +4055,7 @@ func TestWriteJSONDecodeError(t *testing.T) {
// Unless specific metav1.Status() parameters are implemented for the particular error in question, such that // Unless specific metav1.Status() parameters are implemented for the particular error in question, such that
// the status code is defined, metav1 errors where error.status == metav1.StatusFailure // the status code is defined, metav1 errors where error.status == metav1.StatusFailure
// will throw a '500 Internal Server Error'. Non-metav1 type errors will always throw a '500 Internal Server Error'. // will throw a '500 Internal Server Error'. Non-metav1 type errors will always throw a '500 Internal Server Error'.
status := expectApiStatus(t, "GET", server.URL, nil, http.StatusInternalServerError) status := expectAPIStatus(t, "GET", server.URL, nil, http.StatusInternalServerError)
if status.Reason != metav1.StatusReasonUnknown { if status.Reason != metav1.StatusReasonUnknown {
t.Errorf("unexpected reason %#v", status) t.Errorf("unexpected reason %#v", status)
} }
@ -4109,7 +4109,7 @@ func TestCreateTimeout(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
itemOut := expectApiStatus(t, "POST", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/foo?timeout=4ms", data, http.StatusGatewayTimeout) itemOut := expectAPIStatus(t, "POST", server.URL+"/"+prefix+"/"+testGroupVersion.Group+"/"+testGroupVersion.Version+"/namespaces/default/foo?timeout=4ms", data, http.StatusGatewayTimeout)
if itemOut.Status != metav1.StatusFailure || itemOut.Reason != metav1.StatusReasonTimeout { if itemOut.Status != metav1.StatusFailure || itemOut.Reason != metav1.StatusReasonTimeout {
t.Errorf("Unexpected status %#v", itemOut) t.Errorf("Unexpected status %#v", itemOut)
} }
@ -4287,12 +4287,12 @@ func TestDryRunDisabled(t *testing.T) {
})) }))
defer server.Close() defer server.Close()
for _, test := range tests { for _, test := range tests {
baseUrl := server.URL + "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version baseURL := server.URL + "/" + prefix + "/" + testGroupVersion.Group + "/" + testGroupVersion.Version
response := runRequest(t, baseUrl+test.path, test.verb, test.data, test.contentType) response := runRequest(t, baseURL+test.path, test.verb, test.data, test.contentType)
if response.StatusCode == http.StatusBadRequest { if response.StatusCode == http.StatusBadRequest {
t.Fatalf("unexpected BadRequest: %#v", response) t.Fatalf("unexpected BadRequest: %#v", response)
} }
response = runRequest(t, baseUrl+test.path+"?dryRun", test.verb, test.data, test.contentType) response = runRequest(t, baseURL+test.path+"?dryRun", test.verb, test.data, test.contentType)
if response.StatusCode != http.StatusBadRequest { if response.StatusCode != http.StatusBadRequest {
t.Fatalf("unexpected non BadRequest: %#v", response) t.Fatalf("unexpected non BadRequest: %#v", response)
} }