chore: merge probe-engine into probe-cli (#201)
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
This commit is contained in:
parent
b1ce300c8d
commit
d57c78bc71
535 changed files with 66182 additions and 23 deletions
180
internal/engine/resources/resources_test.go
Normal file
180
internal/engine/resources/resources_test.go
Normal file
|
|
@ -0,0 +1,180 @@
|
|||
package resources_test
|
||||
|
||||
import (
|
||||
"compress/gzip"
|
||||
"context"
|
||||
"errors"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"github.com/apex/log"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/resources"
|
||||
)
|
||||
|
||||
func TestEnsureMkdirAllFailure(t *testing.T) {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
expected := errors.New("mocked error")
|
||||
client := resources.Client{
|
||||
HTTPClient: http.DefaultClient,
|
||||
Logger: log.Log,
|
||||
OSMkdirAll: func(string, os.FileMode) error {
|
||||
return expected
|
||||
},
|
||||
UserAgent: "ooniprobe-engine/0.1.0",
|
||||
WorkDir: "/foobar",
|
||||
}
|
||||
err := client.Ensure(context.Background())
|
||||
if !errors.Is(err, expected) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsure(t *testing.T) {
|
||||
tempdir, err := ioutil.TempDir("", "ooniprobe-engine-resources-test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := resources.Client{
|
||||
HTTPClient: http.DefaultClient,
|
||||
Logger: log.Log,
|
||||
UserAgent: "ooniprobe-engine/0.1.0",
|
||||
WorkDir: tempdir,
|
||||
}
|
||||
err = client.Ensure(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// the second round should be idempotent
|
||||
err = client.Ensure(context.Background())
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureFailure(t *testing.T) {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
tempdir, err := ioutil.TempDir("", "ooniprobe-engine-resources-test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := resources.Client{
|
||||
HTTPClient: http.DefaultClient,
|
||||
Logger: log.Log,
|
||||
UserAgent: "ooniprobe-engine/0.1.0",
|
||||
WorkDir: tempdir,
|
||||
}
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel()
|
||||
err = client.Ensure(ctx)
|
||||
if !errors.Is(err, context.Canceled) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureFailAllComparisons(t *testing.T) {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
tempdir, err := ioutil.TempDir("", "ooniprobe-engine-resources-test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := resources.Client{
|
||||
HTTPClient: http.DefaultClient,
|
||||
Logger: log.Log,
|
||||
UserAgent: "ooniprobe-engine/0.1.0",
|
||||
WorkDir: tempdir,
|
||||
}
|
||||
// run once to download the resource once
|
||||
err = client.EnsureForSingleResource(
|
||||
context.Background(), "ca-bundle.pem", resources.ResourceInfo{
|
||||
URLPath: "/ooni/probe-assets/releases/download/20190822135402/ca-bundle.pem.gz",
|
||||
GzSHA256: "d5a6aa2290ee18b09cc4fb479e2577ed5ae66c253870ba09776803a5396ea3ab",
|
||||
SHA256: "cb2eca3fbfa232c9e3874e3852d43b33589f27face98eef10242a853d83a437a",
|
||||
}, func(left, right string) bool {
|
||||
return left == right
|
||||
},
|
||||
gzip.NewReader, ioutil.ReadAll,
|
||||
)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// re-run with broken comparison operator so that we should
|
||||
// first redownload and then fail for invalid SHA256.
|
||||
err = client.EnsureForSingleResource(
|
||||
context.Background(), "ca-bundle.pem", resources.ResourceInfo{
|
||||
URLPath: "/ooni/probe-assets/releases/download/20190822135402/ca-bundle.pem.gz",
|
||||
GzSHA256: "d5a6aa2290ee18b09cc4fb479e2577ed5ae66c253870ba09776803a5396ea3ab",
|
||||
SHA256: "cb2eca3fbfa232c9e3874e3852d43b33589f27face98eef10242a853d83a437a",
|
||||
}, func(left, right string) bool {
|
||||
return false // comparison for equality always fails
|
||||
},
|
||||
gzip.NewReader, ioutil.ReadAll,
|
||||
)
|
||||
if err == nil || !strings.HasSuffix(err.Error(), "sha256 mismatch") {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureFailGzipNewReader(t *testing.T) {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
tempdir, err := ioutil.TempDir("", "ooniprobe-engine-resources-test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := resources.Client{
|
||||
HTTPClient: http.DefaultClient,
|
||||
Logger: log.Log,
|
||||
UserAgent: "ooniprobe-engine/0.1.0",
|
||||
WorkDir: tempdir,
|
||||
}
|
||||
expected := errors.New("mocked error")
|
||||
err = client.EnsureForSingleResource(
|
||||
context.Background(), "ca-bundle.pem", resources.ResourceInfo{
|
||||
URLPath: "/ooni/probe-assets/releases/download/20190822135402/ca-bundle.pem.gz",
|
||||
GzSHA256: "d5a6aa2290ee18b09cc4fb479e2577ed5ae66c253870ba09776803a5396ea3ab",
|
||||
SHA256: "cb2eca3fbfa232c9e3874e3852d43b33589f27face98eef10242a853d83a437a",
|
||||
}, func(left, right string) bool {
|
||||
return left == right
|
||||
},
|
||||
func(r io.Reader) (*gzip.Reader, error) {
|
||||
return nil, expected
|
||||
},
|
||||
ioutil.ReadAll,
|
||||
)
|
||||
if !errors.Is(err, expected) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestEnsureFailIoUtilReadAll(t *testing.T) {
|
||||
log.SetLevel(log.DebugLevel)
|
||||
tempdir, err := ioutil.TempDir("", "ooniprobe-engine-resources-test")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
client := resources.Client{
|
||||
HTTPClient: http.DefaultClient,
|
||||
Logger: log.Log,
|
||||
UserAgent: "ooniprobe-engine/0.1.0",
|
||||
WorkDir: tempdir,
|
||||
}
|
||||
expected := errors.New("mocked error")
|
||||
err = client.EnsureForSingleResource(
|
||||
context.Background(), "ca-bundle.pem", resources.ResourceInfo{
|
||||
URLPath: "/ooni/probe-assets/releases/download/20190822135402/ca-bundle.pem.gz",
|
||||
GzSHA256: "d5a6aa2290ee18b09cc4fb479e2577ed5ae66c253870ba09776803a5396ea3ab",
|
||||
SHA256: "cb2eca3fbfa232c9e3874e3852d43b33589f27face98eef10242a853d83a437a",
|
||||
}, func(left, right string) bool {
|
||||
return left == right
|
||||
},
|
||||
gzip.NewReader, func(r io.Reader) ([]byte, error) {
|
||||
return nil, expected
|
||||
},
|
||||
)
|
||||
if !errors.Is(err, expected) {
|
||||
t.Fatal("not the error we expected")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue