273b70bacc
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: https://github.com/ooni/probe/issues/1885 - [x] related ooni/spec pull request: N/A Location of the issue tracker: https://github.com/ooni/probe ## Description This PR contains a set of changes to move important interfaces and data types into the `./internal/model` package. The criteria for including an interface or data type in here is roughly that the type should be important and used by several packages. We are especially interested to move more interfaces here to increase modularity. An additional side effect is that, by reading this package, one should be able to understand more quickly how different parts of the codebase interact with each other. This is what I want to move in `internal/model`: - [x] most important interfaces from `internal/netxlite` - [x] everything that was previously part of `internal/engine/model` - [x] mocks from `internal/netxlite/mocks` should also be moved in here as a subpackage
158 lines
3.7 KiB
Go
158 lines
3.7 KiB
Go
package errorsx
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"errors"
|
|
"io"
|
|
"net"
|
|
"testing"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/model/mocks"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
nlmocks "github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
|
|
)
|
|
|
|
func TestErrorWrapperQUICListenerSuccess(t *testing.T) {
|
|
ql := &ErrorWrapperQUICListener{
|
|
QUICListener: &mocks.QUICListener{
|
|
MockListen: func(addr *net.UDPAddr) (model.UDPLikeConn, error) {
|
|
return &net.UDPConn{}, nil
|
|
},
|
|
},
|
|
}
|
|
pconn, err := ql.Listen(&net.UDPAddr{})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
pconn.Close()
|
|
}
|
|
|
|
func TestErrorWrapperQUICListenerFailure(t *testing.T) {
|
|
ql := &ErrorWrapperQUICListener{
|
|
QUICListener: &mocks.QUICListener{
|
|
MockListen: func(addr *net.UDPAddr) (model.UDPLikeConn, error) {
|
|
return nil, io.EOF
|
|
},
|
|
},
|
|
}
|
|
pconn, err := ql.Listen(&net.UDPAddr{})
|
|
if err.Error() != "eof_error" {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if pconn != nil {
|
|
t.Fatal("expected nil pconn here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnWriteToSuccess(t *testing.T) {
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPLikeConn{
|
|
MockWriteTo: func(p []byte, addr net.Addr) (int, error) {
|
|
return 10, nil
|
|
},
|
|
},
|
|
}
|
|
pkt := make([]byte, 128)
|
|
addr := &net.UDPAddr{}
|
|
cnt, err := quc.WriteTo(pkt, addr)
|
|
if err != nil {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if cnt != 10 {
|
|
t.Fatal("expected 10 here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnWriteToFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPLikeConn{
|
|
MockWriteTo: func(p []byte, addr net.Addr) (int, error) {
|
|
return 0, expected
|
|
},
|
|
},
|
|
}
|
|
pkt := make([]byte, 128)
|
|
addr := &net.UDPAddr{}
|
|
cnt, err := quc.WriteTo(pkt, addr)
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if cnt != 0 {
|
|
t.Fatal("expected 0 here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnReadFromSuccess(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPLikeConn{
|
|
MockReadFrom: func(b []byte) (int, net.Addr, error) {
|
|
return 0, nil, expected
|
|
},
|
|
},
|
|
}
|
|
b := make([]byte, 128)
|
|
n, addr, err := quc.ReadFrom(b)
|
|
if !errors.Is(err, expected) {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if n != 0 {
|
|
t.Fatal("expected 0 here")
|
|
}
|
|
if addr != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperUDPConnReadFromFailure(t *testing.T) {
|
|
quc := &errorWrapperUDPConn{
|
|
UDPLikeConn: &mocks.QUICUDPLikeConn{
|
|
MockReadFrom: func(b []byte) (int, net.Addr, error) {
|
|
return 10, nil, nil
|
|
},
|
|
},
|
|
}
|
|
b := make([]byte, 128)
|
|
n, addr, err := quc.ReadFrom(b)
|
|
if err != nil {
|
|
t.Fatal("not the error we expected", err)
|
|
}
|
|
if n != 10 {
|
|
t.Fatal("expected 10 here")
|
|
}
|
|
if addr != nil {
|
|
t.Fatal("expected nil here")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperQUICDialerFailure(t *testing.T) {
|
|
ctx := context.Background()
|
|
d := &ErrorWrapperQUICDialer{Dialer: &nlmocks.QUICContextDialer{
|
|
MockDialContext: func(ctx context.Context, network, address string, tlsConfig *tls.Config, quicConfig *quic.Config) (quic.EarlySession, error) {
|
|
return nil, io.EOF
|
|
},
|
|
}}
|
|
sess, err := d.DialContext(
|
|
ctx, "udp", "www.google.com:443", &tls.Config{}, &quic.Config{})
|
|
if sess != nil {
|
|
t.Fatal("expected a nil sess here")
|
|
}
|
|
if !errors.Is(err, io.EOF) {
|
|
t.Fatal("expected another error here")
|
|
}
|
|
var errWrapper *netxlite.ErrWrapper
|
|
if !errors.As(err, &errWrapper) {
|
|
t.Fatal("cannot cast to ErrWrapper")
|
|
}
|
|
if errWrapper.Operation != netxlite.QUICHandshakeOperation {
|
|
t.Fatal("unexpected Operation")
|
|
}
|
|
if errWrapper.Failure != netxlite.FailureEOFError {
|
|
t.Fatal("unexpected failure")
|
|
}
|
|
}
|