c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages 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
commit fd5405ade1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 64 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/engine/experiment/dash/dash_test.go
View file

@ -3,7 +3,7 @@ package dash
import (
"context"
"errors"
"io/ioutil"
"io"
"net/http"
"strings"
"testing"
@ -47,7 +47,7 @@ func TestRunnerLoopNegotiateFailure(t *testing.T) {
all: []FakeHTTPTransport{
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"fqdn": "ams01.measurementlab.net"}`)),
StatusCode: 200,
},
@ -77,14 +77,14 @@ func TestRunnerLoopMeasureFailure(t *testing.T) {
all: []FakeHTTPTransport{
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"fqdn": "ams01.measurementlab.net"}`)),
StatusCode: 200,
},
},
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"authorization": "xx", "unchoked": 1}`)),
StatusCode: 200,
},
@ -116,21 +116,21 @@ func TestRunnerLoopCollectFailure(t *testing.T) {
all: []FakeHTTPTransport{
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"fqdn": "ams01.measurementlab.net"}`)),
StatusCode: 200,
},
},
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"authorization": "xx", "unchoked": 1}`)),
StatusCode: 200,
},
},
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(`1234567`)),
Body: io.NopCloser(strings.NewReader(`1234567`)),
StatusCode: 200,
},
},
@ -160,27 +160,27 @@ func TestRunnerLoopSuccess(t *testing.T) {
all: []FakeHTTPTransport{
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"fqdn": "ams01.measurementlab.net"}`)),
StatusCode: 200,
},
},
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(
Body: io.NopCloser(strings.NewReader(
`{"authorization": "xx", "unchoked": 1}`)),
StatusCode: 200,
},
},
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(`1234567`)),
Body: io.NopCloser(strings.NewReader(`1234567`)),
StatusCode: 200,
},
},
{
resp: &http.Response{
Body: ioutil.NopCloser(strings.NewReader(`[]`)),
Body: io.NopCloser(strings.NewReader(`[]`)),
StatusCode: 200,
},
},