Simone Basso
d57c78bc71
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
60 lines
1.5 KiB
Go
60 lines
1.5 KiB
Go
package internal_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/cmd/oohelperd/internal"
|
|
)
|
|
|
|
func TestHTTPDoWithInvalidURL(t *testing.T) {
|
|
ctx := context.Background()
|
|
wg := new(sync.WaitGroup)
|
|
httpch := make(chan internal.CtrlHTTPResponse, 1)
|
|
wg.Add(1)
|
|
go internal.HTTPDo(ctx, &internal.HTTPConfig{
|
|
Client: http.DefaultClient,
|
|
Headers: nil,
|
|
MaxAcceptableBody: 1 << 24,
|
|
Out: httpch,
|
|
URL: "http://[::1]aaaa",
|
|
Wg: wg,
|
|
})
|
|
// wait for measurement steps to complete
|
|
wg.Wait()
|
|
resp := <-httpch
|
|
if resp.Failure == nil || !strings.HasSuffix(*resp.Failure, `invalid port "aaaa" after host`) {
|
|
t.Fatal("not the failure we expected")
|
|
}
|
|
}
|
|
|
|
func TestHTTPDoWithHTTPTransportFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
ctx := context.Background()
|
|
wg := new(sync.WaitGroup)
|
|
httpch := make(chan internal.CtrlHTTPResponse, 1)
|
|
wg.Add(1)
|
|
go internal.HTTPDo(ctx, &internal.HTTPConfig{
|
|
Client: &http.Client{
|
|
Transport: internal.FakeTransport{
|
|
Err: expected,
|
|
},
|
|
},
|
|
Headers: nil,
|
|
MaxAcceptableBody: 1 << 24,
|
|
Out: httpch,
|
|
URL: "http://www.x.org",
|
|
Wg: wg,
|
|
})
|
|
// wait for measurement steps to complete
|
|
wg.Wait()
|
|
resp := <-httpch
|
|
if resp.Failure == nil || !strings.HasSuffix(*resp.Failure, "mocked error") {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
}
|