06ee0e55a9
* refactor(netx/dialer): hide implementation complexity This follows the blueprint of `module.Config` and `nodule.New` described at https://github.com/ooni/probe/issues/1591. * fix: ndt7 bug where we were not using the right resolver * fix(legacy/netx): clarify irrelevant implementation change * fix: improve comments * fix(hhfm): do not use dialer.New b/c it breaks it Unclear to me why this is happening. Still, improve upon the previous situation by adding a timeout. It does not seem a priority to look into this issue now.
85 lines
2.1 KiB
Go
85 lines
2.1 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/mockablex"
|
|
)
|
|
|
|
func TestErrorWrapperFailure(t *testing.T) {
|
|
ctx := context.Background()
|
|
d := &errorWrapperDialer{Dialer: mockablex.Dialer{
|
|
MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return nil, io.EOF
|
|
},
|
|
}}
|
|
conn, err := d.DialContext(ctx, "tcp", "www.google.com:443")
|
|
if conn != nil {
|
|
t.Fatal("expected a nil conn here")
|
|
}
|
|
errorWrapperCheckErr(t, err, errorx.ConnectOperation)
|
|
}
|
|
|
|
func errorWrapperCheckErr(t *testing.T, err error, op string) {
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("expected another error here")
|
|
}
|
|
var errWrapper *errorx.ErrWrapper
|
|
if !errors.As(err, &errWrapper) {
|
|
t.Fatal("cannot cast to ErrWrapper")
|
|
}
|
|
if errWrapper.Operation != op {
|
|
t.Fatal("unexpected Operation")
|
|
}
|
|
if errWrapper.Failure != errorx.FailureEOFError {
|
|
t.Fatal("unexpected failure")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperSuccess(t *testing.T) {
|
|
ctx := context.Background()
|
|
d := &errorWrapperDialer{Dialer: mockablex.Dialer{
|
|
MockDialContext: func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return &mockablex.Conn{
|
|
MockRead: func(b []byte) (int, error) {
|
|
return 0, io.EOF
|
|
},
|
|
MockWrite: func(b []byte) (int, error) {
|
|
return 0, io.EOF
|
|
},
|
|
MockClose: func() error {
|
|
return io.EOF
|
|
},
|
|
MockLocalAddr: func() net.Addr {
|
|
return &net.TCPAddr{Port: 12345}
|
|
},
|
|
}, nil
|
|
},
|
|
}}
|
|
conn, err := d.DialContext(ctx, "tcp", "www.google.com")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if conn == nil {
|
|
t.Fatal("expected non-nil conn here")
|
|
}
|
|
count, err := conn.Read(nil)
|
|
errorWrapperCheckIOResult(t, count, err, errorx.ReadOperation)
|
|
count, err = conn.Write(nil)
|
|
errorWrapperCheckIOResult(t, count, err, errorx.WriteOperation)
|
|
err = conn.Close()
|
|
errorWrapperCheckErr(t, err, errorx.CloseOperation)
|
|
}
|
|
|
|
func errorWrapperCheckIOResult(t *testing.T, count int, err error, op string) {
|
|
if count != 0 {
|
|
t.Fatal("expected nil count here")
|
|
}
|
|
errorWrapperCheckErr(t, err, op)
|
|
}
|