2e0118d1a6
## Description This PR continues the refactoring of `netx` under the following principles: 1. do not break the rest of the tree and do not engage in extensive tree-wide refactoring yet 2. move under `netxlite` clearly related subpackages (e.g., `iox`, `netxmocks`) 3. move into `internal/netxlite/internal` stuff that is clearly private of `netxlite` 4. hide implementation details in `netxlite` pending new factories 5. refactor `tls` code in `netxlite` to clearly separate `crypto/tls` code from `utls` code After each commit, I run `go test -short -race ./...` locally. Each individual commit explains what it does. I will squash, but this operation will preserve the original commit titles, so this will give further insight on each step. ## Commits * refactor: rename netxmocks -> netxlite/mocks Part of https://github.com/ooni/probe/issues/1591 * refactor: rename quicx -> netxlite/quicx See https://github.com/ooni/probe/issues/1591 * refactor: rename iox -> netxlite/iox Regenerate sources and make sure the tests pass. See https://github.com/ooni/probe/issues/1591. * refactor(iox): move MockableReader to netxlite/mocks See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): generator is an implementation detail See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): separate tls and utls code See https://github.com/ooni/probe/issues/1591 * refactor(netxlite): hide most types but keep old names as legacy With this change we avoid breaking the rest of the tree, but we start hiding some implementation details a bit. Factories will follow. See https://github.com/ooni/probe/issues/1591
81 lines
1.8 KiB
Go
81 lines
1.8 KiB
Go
package errorsx
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
|
)
|
|
|
|
func TestErrorWrapperResolverSuccess(t *testing.T) {
|
|
orig := []string{"8.8.8.8"}
|
|
r := &ErrorWrapperResolver{
|
|
Resolver: &mocks.Resolver{
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
return orig, nil
|
|
},
|
|
},
|
|
}
|
|
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 TestErrorWrapperResolverFailure(t *testing.T) {
|
|
r := &ErrorWrapperResolver{
|
|
Resolver: &mocks.Resolver{
|
|
MockLookupHost: func(ctx context.Context, domain string) ([]string, error) {
|
|
return nil, errors.New("no such host")
|
|
},
|
|
},
|
|
}
|
|
ctx := context.Background()
|
|
addrs, err := r.LookupHost(ctx, "dns.google.com")
|
|
if addrs != nil {
|
|
t.Fatal("expected nil addr here")
|
|
}
|
|
var errWrapper *ErrWrapper
|
|
if !errors.As(err, &errWrapper) {
|
|
t.Fatal("cannot properly cast the returned error")
|
|
}
|
|
if errWrapper.Failure != FailureDNSNXDOMAINError {
|
|
t.Fatal("unexpected failure")
|
|
}
|
|
if errWrapper.Operation != ResolveOperation {
|
|
t.Fatal("unexpected Operation")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperResolverChildNetworkAddress(t *testing.T) {
|
|
r := &ErrorWrapperResolver{Resolver: &mocks.Resolver{
|
|
MockNetwork: func() string {
|
|
return "udp"
|
|
},
|
|
MockAddress: func() string {
|
|
return "8.8.8.8:53"
|
|
},
|
|
}}
|
|
if r.Network() != "udp" {
|
|
t.Fatal("invalid Network")
|
|
}
|
|
if r.Address() != "8.8.8.8:53" {
|
|
t.Fatal("invalid Address")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperResolverNoChildNetworkAddress(t *testing.T) {
|
|
r := &ErrorWrapperResolver{Resolver: &net.Resolver{}}
|
|
if r.Network() != "errorWrapper" {
|
|
t.Fatal("invalid Network")
|
|
}
|
|
if r.Address() != "" {
|
|
t.Fatal("invalid Address")
|
|
}
|
|
}
|