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
59 lines
1.5 KiB
Go
59 lines
1.5 KiB
Go
package resolver_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/dialid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/transactionid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
|
|
)
|
|
|
|
func TestErrorWrapperSuccess(t *testing.T) {
|
|
orig := []string{"8.8.8.8"}
|
|
r := resolver.ErrorWrapperResolver{
|
|
Resolver: resolver.NewFakeResolverWithResult(orig),
|
|
}
|
|
addrs, err := r.LookupHost(context.Background(), "dns.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if len(addrs) != len(orig) || addrs[0] != orig[0] {
|
|
t.Fatal("not the result we expected")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperFailure(t *testing.T) {
|
|
r := resolver.ErrorWrapperResolver{
|
|
Resolver: resolver.NewFakeResolverThatFails(),
|
|
}
|
|
ctx := context.Background()
|
|
ctx = dialid.WithDialID(ctx)
|
|
ctx = transactionid.WithTransactionID(ctx)
|
|
addrs, err := r.LookupHost(ctx, "dns.google.com")
|
|
if addrs != nil {
|
|
t.Fatal("expected nil addr here")
|
|
}
|
|
var errWrapper *errorx.ErrWrapper
|
|
if !errors.As(err, &errWrapper) {
|
|
t.Fatal("cannot properly cast the returned error")
|
|
}
|
|
if errWrapper.Failure != errorx.FailureDNSNXDOMAINError {
|
|
t.Fatal("unexpected failure")
|
|
}
|
|
if errWrapper.ConnID != 0 {
|
|
t.Fatal("unexpected ConnID")
|
|
}
|
|
if errWrapper.DialID == 0 {
|
|
t.Fatal("unexpected DialID")
|
|
}
|
|
if errWrapper.TransactionID == 0 {
|
|
t.Fatal("unexpected TransactionID")
|
|
}
|
|
if errWrapper.Operation != errorx.ResolveOperation {
|
|
t.Fatal("unexpected Operation")
|
|
}
|
|
}
|