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

fix(all): introduce and use iox.CopyContext (#380)

Browse source 
* fix(all): introduce and use iox.CopyContext

This PR is part of https://github.com/ooni/probe/issues/1417.

In https://github.com/ooni/probe-cli/pull/379 we introduced a context
aware wrapper for io.ReadAll (formerly ioutil.ReadAll).

Here we introduce a context aware wrapper for io.Copy.

* fix(humanize): more significant digits

* fix: rename humanize files to follow the common pattern

* fix aligment

* fix test
This commit is contained in:
Simone Basso 2021-06-15 13:44:28 +02:00 • committed by GitHub
commit 721ce95315
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 143 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/ooniprobe/internal/config/parser_test.go
View file

@ -1,12 +1,14 @@
package config
import (
"context"
"crypto/sha256"
"encoding/hex"
"io"
"io/ioutil"
"os"
"testing"
"github.com/ooni/probe-cli/v3/internal/iox"
)
func getShasum(path string) (string, error) {
@ -17,7 +19,7 @@ func getShasum(path string) (string, error) {
return "", err
}
defer f.Close()
if _, err := io.Copy(hasher, f); err != nil {
if _, err := iox.CopyContext(context.Background(), hasher, f); err != nil {
return "", err
}
return hex.EncodeToString(hasher.Sum(nil)), nil