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
57 lines
1.3 KiB
Go
57 lines
1.3 KiB
Go
package internal_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/tlstool/internal"
|
|
)
|
|
|
|
func TestDialerFailure(t *testing.T) {
|
|
expected := errors.New("mocked error")
|
|
dialer := internal.Dialer{Dialer: internal.FakeDialer{
|
|
Err: expected,
|
|
}}
|
|
conn, err := dialer.DialContext(context.Background(), "tcp", "8.8.8.8:853")
|
|
if !errors.Is(err, expected) {
|
|
t.Fatalf("not the error we expected: %+v", err)
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
}
|
|
|
|
func TestDialerSuccess(t *testing.T) {
|
|
splitter := func([]byte) [][]byte {
|
|
return nil // any value is fine we just a need a splitter != nil here
|
|
}
|
|
innerconn := &internal.FakeConn{}
|
|
dialer := internal.Dialer{
|
|
Delay: 12345,
|
|
Dialer: internal.FakeDialer{Conn: innerconn},
|
|
Splitter: splitter,
|
|
}
|
|
conn, err := dialer.DialContext(context.Background(), "tcp", "8.8.8.8:853")
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
sconn, ok := conn.(internal.SplitterWriter)
|
|
if !ok {
|
|
t.Fatal("the outer connection is not a splitter")
|
|
}
|
|
if sconn.Splitter == nil {
|
|
t.Fatal("not the splitter we expected")
|
|
}
|
|
dconn, ok := sconn.Conn.(internal.SleeperWriter)
|
|
if !ok {
|
|
t.Fatal("the inner connection is not a sleeper")
|
|
}
|
|
if dconn.Delay != 12345 {
|
|
t.Fatal("invalid delay")
|
|
}
|
|
if dconn.Conn != innerconn {
|
|
t.Fatal("invalid inner connection")
|
|
}
|
|
}
|