c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup(all): stop using deprecated ioutil functions (#381)

Browse Source 
Spotted while working on https://github.com/ooni/probe/issues/1417

See https://golang.org/pkg/io/ioutil/
This commit is contained in:
Simone Basso
2021-06-15 14:01:45 +02:00
committed by GitHub
parent 721ce95315
commit fd5405ade1
25 changed files with 64 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/engine/netx/dialer/bytecounter_test.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"context"
"errors"
"io"
"io/ioutil"
"net"
"net/http"
"testing"
@@ -28,7 +27,7 @@ func dorequest(ctx context.Context, url string) error {
if err != nil {
return err
}
if _, err := iox.CopyContext(ctx, ioutil.Discard, resp.Body); err != nil {
if _, err := iox.CopyContext(ctx, io.Discard, resp.Body); err != nil {
return err
}
return resp.Body.Close()
internal/engine/netx/httptransport/bytecounter_test.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"context"
"errors"
"io"
"io/ioutil"
"net/http"
"strings"
"testing"
@@ -50,7 +49,7 @@ func TestByteCounterSuccess(t *testing.T) {
Counter: counter,
RoundTripper: httptransport.FakeTransport{
Resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader("1234567")),
Body: io.NopCloser(strings.NewReader("1234567")),
Header: http.Header{
"Server": []string{"antani/0.1.0"},
},
internal/engine/netx/httptransport/logging_test.go
+1 -2
View File
@@ -4,7 +4,6 @@ import (
"context"
"errors"
"io"
"io/ioutil"
"net/http"
"net/url"
"strings"
@@ -61,7 +60,7 @@ func TestLoggingSuccess(t *testing.T) {
Logger: log.Log,
RoundTripper: httptransport.FakeTransport{
Resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader("")),
Body: io.NopCloser(strings.NewReader("")),
Header: http.Header{
"Server": []string{"antani/0.1.0"},
},
internal/engine/netx/httptransport/saver_test.go
+2 -2
View File
@@ -3,7 +3,7 @@ package httptransport_test
import (
"context"
"errors"
"io/ioutil"
"io"
"net/http"
"strings"
"testing"
@@ -256,7 +256,7 @@ func TestSaverBodySuccess(t *testing.T) {
}
return &http.Response{
StatusCode: 501,
Body: ioutil.NopCloser(strings.NewReader("abad1dea")),
Body: io.NopCloser(strings.NewReader("abad1dea")),
}, nil
},
},
internal/engine/netx/resolver/dnsoverhttps_test.go
+4 -4
View File
@@ -4,7 +4,7 @@ import (
"bytes"
"context"
"errors"
"io/ioutil"
"io"
"net/http"
"strings"
"testing"
@@ -47,7 +47,7 @@ func TestDNSOverHTTPSHTTPFailure(t *testing.T) {
Do: func(*http.Request) (*http.Response, error) {
return &http.Response{
StatusCode: 500,
Body: ioutil.NopCloser(strings.NewReader("")),
Body: io.NopCloser(strings.NewReader("")),
}, nil
},
URL: "https://cloudflare-dns.com/dns-query",
@@ -66,7 +66,7 @@ func TestDNSOverHTTPSMissingContentType(t *testing.T) {
Do: func(*http.Request) (*http.Response, error) {
return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(strings.NewReader("")),
Body: io.NopCloser(strings.NewReader("")),
}, nil
},
URL: "https://cloudflare-dns.com/dns-query",
@@ -86,7 +86,7 @@ func TestDNSOverHTTPSSuccess(t *testing.T) {
Do: func(*http.Request) (*http.Response, error) {
return &http.Response{
StatusCode: 200,
Body: ioutil.NopCloser(bytes.NewReader(body)),
Body: io.NopCloser(bytes.NewReader(body)),
Header: http.Header{
"Content-Type": []string{"application/dns-message"},
},