Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 55fb9c7

Browse filesBrowse files
karlkfikarlkfi
committed
test: use io instead of io/ioutil in watch tests
- io/ioutil is deprecated
1 parent 28dcd3a commit 55fb9c7
Copy full SHA for 55fb9c7

File tree

2 files changed

+23
-25
lines changed
Filter options

2 files changed

+23
-25
lines changed

‎staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go

Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
+19-20Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"errors"
2525
"fmt"
2626
"io"
27-
"io/ioutil"
2827
"math/rand"
2928
"net/http"
3029
"net/http/httptest"
@@ -698,7 +697,7 @@ func extractBody(response *http.Response, object runtime.Object) (string, error)
698697

699698
func extractBodyDecoder(response *http.Response, object runtime.Object, decoder runtime.Decoder) (string, error) {
700699
defer response.Body.Close()
701-
body, err := ioutil.ReadAll(response.Body)
700+
body, err := io.ReadAll(response.Body)
702701
if err != nil {
703702
return string(body), err
704703
}
@@ -707,7 +706,7 @@ func extractBodyDecoder(response *http.Response, object runtime.Object, decoder
707706

708707
func extractBodyObject(response *http.Response, decoder runtime.Decoder) (runtime.Object, string, error) {
709708
defer response.Body.Close()
710-
body, err := ioutil.ReadAll(response.Body)
709+
body, err := io.ReadAll(response.Body)
711710
if err != nil {
712711
return nil, string(body), err
713712
}
@@ -865,7 +864,7 @@ func TestUnimplementedRESTStorage(t *testing.T) {
865864
response, err := client.Do(request)
866865
require.NoError(t, err)
867866
defer apitesting.Close(t, response.Body)
868-
data, err := ioutil.ReadAll(response.Body)
867+
data, err := io.ReadAll(response.Body)
869868
require.NoError(t, err)
870869
require.Equal(t, v.ErrCode, response.StatusCode, string(data))
871870
})
@@ -928,7 +927,7 @@ func TestSomeUnimplementedRESTStorage(t *testing.T) {
928927
response, err := client.Do(request)
929928
require.NoError(t, err)
930929
defer apitesting.Close(t, response.Body)
931-
data, err := ioutil.ReadAll(response.Body)
930+
data, err := io.ReadAll(response.Body)
932931
require.NoError(t, err)
933932
require.Equal(t, v.ErrCode, response.StatusCode, string(data))
934933
})
@@ -1091,7 +1090,7 @@ func TestList(t *testing.T) {
10911090
defer apitesting.Close(t, resp.Body)
10921091
if resp.StatusCode != http.StatusOK {
10931092
t.Errorf("unexpected status: %d from url %s, Expected: %d, %#v", resp.StatusCode, testCase.url, http.StatusOK, resp)
1094-
body, err := ioutil.ReadAll(resp.Body)
1093+
body, err := io.ReadAll(resp.Body)
10951094
require.NoError(t, err)
10961095
t.Logf("body: %s", string(body))
10971096
return
@@ -1143,7 +1142,7 @@ func TestRequestsWithInvalidQuery(t *testing.T) {
11431142
defer apitesting.Close(t, resp.Body)
11441143
if resp.StatusCode != http.StatusBadRequest {
11451144
t.Errorf("unexpected status: %d from url %s, Expected: %d, %#v", resp.StatusCode, url, http.StatusBadRequest, resp)
1146-
body, err := ioutil.ReadAll(resp.Body)
1145+
body, err := io.ReadAll(resp.Body)
11471146
require.NoError(t, err)
11481147
t.Logf("body: %s", string(body))
11491148
}
@@ -1202,7 +1201,7 @@ func TestListCompression(t *testing.T) {
12021201
defer apitesting.Close(t, resp.Body)
12031202
if resp.StatusCode != http.StatusOK {
12041203
t.Errorf("unexpected status: %d from url %s, Expected: %d, %#v", resp.StatusCode, testCase.url, http.StatusOK, resp)
1205-
body, err := ioutil.ReadAll(resp.Body)
1204+
body, err := io.ReadAll(resp.Body)
12061205
require.NoError(t, err)
12071206
t.Logf("body: %s", string(body))
12081207
return
@@ -1403,7 +1402,7 @@ func BenchmarkGet(b *testing.B) {
14031402
require.NoError(b, err)
14041403
defer apitesting.Close(b, resp.Body)
14051404
require.Equal(b, http.StatusOK, resp.StatusCode)
1406-
_, err = io.Copy(ioutil.Discard, resp.Body)
1405+
_, err = io.Copy(io.Discard, resp.Body)
14071406
require.NoError(b, err)
14081407
}()
14091408
}
@@ -1442,7 +1441,7 @@ func BenchmarkGetNoCompression(b *testing.B) {
14421441
require.NoError(b, err)
14431442
defer apitesting.Close(b, resp.Body)
14441443
require.Equal(b, http.StatusOK, resp.StatusCode)
1445-
_, err = io.Copy(ioutil.Discard, resp.Body)
1444+
_, err = io.Copy(io.Discard, resp.Body)
14461445
require.NoError(b, err)
14471446
}()
14481447
}
@@ -1946,10 +1945,10 @@ func TestWatchTable(t *testing.T) {
19461945
test.send(watcher)
19471946
}()
19481947

1949-
body, err := ioutil.ReadAll(resp.Body)
1948+
body, err := io.ReadAll(resp.Body)
19501949
require.NoError(t, err)
19511950
t.Logf("Body:\n%s", string(body))
1952-
d := watchDecoder(resp.Header.Get("Content-Type"), ioutil.NopCloser(bytes.NewReader(body)))
1951+
d := watchDecoder(resp.Header.Get("Content-Type"), io.NopCloser(bytes.NewReader(body)))
19531952
var actual []*metav1.WatchEvent
19541953
for {
19551954
var event metav1.WatchEvent
@@ -2157,7 +2156,7 @@ func TestGetBinary(t *testing.T) {
21572156
require.NoError(t, err)
21582157
defer apitesting.Close(t, resp.Body)
21592158
require.Equal(t, http.StatusOK, resp.StatusCode)
2160-
body, err := ioutil.ReadAll(resp.Body)
2159+
body, err := io.ReadAll(resp.Body)
21612160
require.NoError(t, err)
21622161
if !stream.closed || stream.version != testGroupVersion.String() || stream.accept != "text/other, */*" ||
21632162
resp.Header.Get("Content-Type") != stream.contentType || string(body) != "response data" {
@@ -2392,7 +2391,7 @@ func TestConnect(t *testing.T) {
23922391
require.NoError(t, err)
23932392
defer apitesting.Close(t, resp.Body)
23942393
require.Equal(t, http.StatusOK, resp.StatusCode)
2395-
body, err := ioutil.ReadAll(resp.Body)
2394+
body, err := io.ReadAll(resp.Body)
23962395
require.NoError(t, err)
23972396
if connectStorage.receivedID != itemID {
23982397
t.Errorf("Unexpected item id. Expected: %s. Actual: %s.", itemID, connectStorage.receivedID)
@@ -2427,7 +2426,7 @@ func TestConnectResponderObject(t *testing.T) {
24272426
require.NoError(t, err)
24282427
defer apitesting.Close(t, resp.Body)
24292428
require.Equal(t, http.StatusCreated, resp.StatusCode)
2430-
body, err := ioutil.ReadAll(resp.Body)
2429+
body, err := io.ReadAll(resp.Body)
24312430
require.NoError(t, err)
24322431
if connectStorage.receivedID != itemID {
24332432
t.Errorf("Unexpected item id. Expected: %s. Actual: %s.", itemID, connectStorage.receivedID)
@@ -2463,7 +2462,7 @@ func TestConnectResponderError(t *testing.T) {
24632462
require.NoError(t, err)
24642463
defer apitesting.Close(t, resp.Body)
24652464
require.Equal(t, http.StatusForbidden, resp.StatusCode)
2466-
body, err := ioutil.ReadAll(resp.Body)
2465+
body, err := io.ReadAll(resp.Body)
24672466
require.NoError(t, err)
24682467
if connectStorage.receivedID != itemID {
24692468
t.Errorf("Unexpected item id. Expected: %s. Actual: %s.", itemID, connectStorage.receivedID)
@@ -2524,7 +2523,7 @@ func TestConnectWithOptions(t *testing.T) {
25242523
require.NoError(t, err)
25252524
defer apitesting.Close(t, resp.Body)
25262525
require.Equal(t, http.StatusOK, resp.StatusCode)
2527-
body, err := ioutil.ReadAll(resp.Body)
2526+
body, err := io.ReadAll(resp.Body)
25282527
require.NoError(t, err)
25292528
if connectStorage.receivedID != itemID {
25302529
t.Errorf("Unexpected item id. Expected: %s. Actual: %s.", itemID, connectStorage.receivedID)
@@ -2568,7 +2567,7 @@ func TestConnectWithOptionsAndPath(t *testing.T) {
25682567
require.NoError(t, err)
25692568
defer apitesting.Close(t, resp.Body)
25702569
require.Equal(t, http.StatusOK, resp.StatusCode)
2571-
body, err := ioutil.ReadAll(resp.Body)
2570+
body, err := io.ReadAll(resp.Body)
25722571
require.NoError(t, err)
25732572
assert.Equal(t, itemID, connectStorage.receivedID)
25742573
assert.Equal(t, responseText, string(body))
@@ -4018,11 +4017,11 @@ func BenchmarkUpdateProtobuf(b *testing.B) {
40184017
require.NoError(b, err)
40194018
defer apitesting.Close(b, response.Body)
40204019
if response.StatusCode != http.StatusBadRequest {
4021-
body, err := ioutil.ReadAll(response.Body)
4020+
body, err := io.ReadAll(response.Body)
40224021
require.NoError(b, err)
40234022
b.Fatalf("Unexpected response %#v\n%s", response, body)
40244023
}
4025-
_, err = ioutil.ReadAll(response.Body)
4024+
_, err = io.ReadAll(response.Body)
40264025
require.NoError(b, err)
40274026
}()
40284027
}

‎staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go

Copy file name to clipboardExpand all lines: staging/src/k8s.io/apiserver/pkg/endpoints/watch_test.go
+4-5Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"encoding/json"
2323
"fmt"
2424
"io"
25-
"io/ioutil"
2625
"net/http"
2726
"net/http/httptest"
2827
"net/url"
@@ -229,7 +228,7 @@ func TestWatchClientClose(t *testing.T) {
229228
defer apitesting.Close(t, response.Body)
230229

231230
if response.StatusCode != http.StatusOK {
232-
b, err := ioutil.ReadAll(response.Body)
231+
b, err := io.ReadAll(response.Body)
233232
require.NoError(t, err)
234233
t.Fatalf("Unexpected response: %#v\n%s", response, string(b))
235234
}
@@ -254,7 +253,7 @@ func TestWatchClientClose(t *testing.T) {
254253
}
255254

256255
// Validate read after close errors
257-
_, err = io.Copy(ioutil.Discard, response.Body)
256+
_, err = io.Copy(io.Discard, response.Body)
258257
apitesting.AssertReadOnClosedBodyError(t, err)
259258
}
260259

@@ -672,7 +671,7 @@ func runWatchHTTPBenchmark(b *testing.B, items []runtime.Object, contentType str
672671
wg.Add(1)
673672
go func() {
674673
defer apitesting.Close(b, resp.Body)
675-
_, err := io.Copy(ioutil.Discard, resp.Body)
674+
_, err := io.Copy(io.Discard, resp.Body)
676675
assert.NoError(b, err)
677676
wg.Done()
678677
}()
@@ -717,7 +716,7 @@ func BenchmarkWatchWebsocket(b *testing.B) {
717716
wg.Add(1)
718717
go func() {
719718
defer apitesting.Close(b, ws)
720-
_, err := io.Copy(ioutil.Discard, ws)
719+
_, err := io.Copy(io.Discard, ws)
721720
assert.NoError(b, err)
722721
wg.Done()
723722
}()

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.