Skip to content

Commit

Permalink
Merge pull request #49481 from jianglingxia/jlx72417
Browse files Browse the repository at this point in the history 
Automatic merge from submit-queue (batch tested with PRs 49370, 49481)

continue Fix error format and info for get_test.go

**What this PR does / why we need it**:
continue fix the error info 
**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #49441 

**Special notes for your reviewer**:

**Release note**:

```release-note
    NONE
  • Loading branch information
Kubernetes Submit Queue authored Aug 6, 2017
2 parents 979c86f + a29675f commit ae4fac4
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions pkg/kubectl/cmd/get_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ func verifyObjects(t *testing.T, expected, actual []runtime.Object) {
var err error

if len(actual) != len(expected) {
t.Fatalf("expected %d, got %d", len(expected), len(actual))
t.Fatalf("expected %d, but actual %d", len(expected), len(actual))
}
for i, obj := range actual {
switch obj.(type) {
Expand All @@ -443,7 +443,7 @@ func verifyObjects(t *testing.T, expected, actual []runtime.Object) {
t.Fatal(err)
}
if !apiequality.Semantic.DeepEqual(expected[i], actualObj) {
t.Errorf("unexpected object: %d \n%#v\n%#v", i, expected[i], actualObj)
t.Errorf("expected object: %#v, but actualObj:%#v\n", expected[i], actualObj)
}
}
}
Expand Down Expand Up @@ -590,7 +590,7 @@ func TestGetMultipleTypeObjects(t *testing.T) {
case "/namespaces/test/services":
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, svc)}, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -629,7 +629,7 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) {
case "/namespaces/test/services":
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, svc)}, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -675,7 +675,7 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) {
t.Fatal(err)
}
if string(actualBytes) != string(expectedBytes) {
t.Errorf("unexpected object:\n%s\n%s", expectedBytes, actualBytes)
t.Errorf("expectedBytes: %s,but actualBytes: %s", expectedBytes, actualBytes)
}
}

Expand All @@ -689,15 +689,15 @@ func TestGetMultipleTypeObjectsWithSelector(t *testing.T) {
NegotiatedSerializer: unstructuredSerializer,
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" {
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
}
switch req.URL.Path {
case "/namespaces/test/pods":
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, pods)}, nil
case "/namespaces/test/services":
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, svc)}, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -746,7 +746,7 @@ func TestGetMultipleTypeObjectsWithDirectReference(t *testing.T) {
case "/namespaces/test/services/bar":
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, &svc.Items[0])}, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -879,7 +879,7 @@ func TestWatchSelector(t *testing.T) {
NegotiatedSerializer: unstructuredSerializer,
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
if req.URL.Query().Get(metav1.LabelSelectorQueryParam(api.Registry.GroupOrDie(api.GroupName).GroupVersion.String())) != "a=b" {
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
}
switch req.URL.Path {
case "/namespaces/test/pods":
Expand All @@ -889,7 +889,7 @@ func TestWatchSelector(t *testing.T) {
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, podList)}, nil
}
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -929,10 +929,10 @@ func TestWatchResource(t *testing.T) {
if req.URL.Query().Get("watch") == "true" && req.URL.Query().Get("fieldSelector") == "metadata.name=foo" {
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil
}
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -971,10 +971,10 @@ func TestWatchResourceIdentifiedByFile(t *testing.T) {
if req.URL.Query().Get("watch") == "true" && req.URL.Query().Get("fieldSelector") == "metadata.name=cassandra" {
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil
}
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -1014,10 +1014,10 @@ func TestWatchOnlyResource(t *testing.T) {
if req.URL.Query().Get("watch") == "true" && req.URL.Query().Get("fieldSelector") == "metadata.name=foo" {
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: watchBody(codec, events[1:])}, nil
}
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down Expand Up @@ -1063,7 +1063,7 @@ func TestWatchOnlyList(t *testing.T) {
return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, podList)}, nil
}
default:
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
t.Fatalf("request url: %#v,and request: %#v", req.URL, req)
return nil, nil
}
}),
Expand Down

0 comments on commit ae4fac4

Please sign in to comment.