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
67 lines
1.8 KiB
Go
67 lines
1.8 KiB
Go
package dialer_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"io"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/dialid"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/dialer"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
|
|
)
|
|
|
|
func TestErrorWrapperFailure(t *testing.T) {
|
|
ctx := dialid.WithDialID(context.Background())
|
|
d := dialer.ErrorWrapperDialer{Dialer: dialer.EOFDialer{}}
|
|
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.DialID == 0 {
|
|
t.Fatal("unexpected DialID")
|
|
}
|
|
if errWrapper.Operation != op {
|
|
t.Fatal("unexpected Operation")
|
|
}
|
|
if errWrapper.Failure != errorx.FailureEOFError {
|
|
t.Fatal("unexpected failure")
|
|
}
|
|
}
|
|
|
|
func TestErrorWrapperSuccess(t *testing.T) {
|
|
ctx := dialid.WithDialID(context.Background())
|
|
d := dialer.ErrorWrapperDialer{Dialer: dialer.EOFConnDialer{}}
|
|
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)
|
|
}
|