github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5002 from satnam6502/proxy-200

Browse Source 
Do not fail status 200 responses to proxy calls
This commit is contained in:
Daniel Smith
2015-03-06 10:20:07 -08:00
parent b0f49449e1 cb4c931b0b
commit 244766ac89
2 changed files with 52 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/client/request_test.go
View File

@@ -233,7 +233,11 @@ func TestTransformResponse(t *testing.T) {
if test.Response.Body == nil {
test.Response.Body = ioutil.NopCloser(bytes.NewReader([]byte{}))
}
response, created, err := r.transformResponse(test.Response, &http.Request{})
body, err := ioutil.ReadAll(test.Response.Body)
if err != nil {
t.Errorf("failed to read body of response: %v", err)
}
response, created, err := r.transformResponse(body, test.Response, &http.Request{})
hasErr := err != nil
if hasErr != test.Error {
t.Errorf("%d: unexpected error: %t %v", i, test.Error, err)
@@ -307,7 +311,11 @@ func TestTransformUnstructuredError(t *testing.T) {
resourceName: testCase.Name,
resource: testCase.Resource,
}
_, _, err := r.transformResponse(testCase.Res, testCase.Req)
body, err := ioutil.ReadAll(testCase.Res.Body)
if err != nil {
t.Errorf("failed to read body: %v", err)
}
_, _, err = r.transformResponse(body, testCase.Res, testCase.Req)
if !testCase.ErrFn(err) {
t.Errorf("unexpected error: %v", err)
continue