d57c78bc71This 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
80 lines
1.7 KiB
Go
80 lines
1.7 KiB
Go
package tunnel_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/mockable"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/tunnel"
|
|
)
|
|
|
|
func TestNoTunnel(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel()
|
|
tunnel, err := tunnel.Start(ctx, tunnel.Config{
|
|
Name: "",
|
|
Session: &mockable.Session{
|
|
MockableLogger: log.Log,
|
|
},
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if tunnel != nil {
|
|
t.Fatal("expected nil tunnel here")
|
|
}
|
|
}
|
|
|
|
func TestPsiphonTunnel(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel()
|
|
tunnel, err := tunnel.Start(ctx, tunnel.Config{
|
|
Name: "psiphon",
|
|
Session: &mockable.Session{
|
|
MockableLogger: log.Log,
|
|
},
|
|
})
|
|
if !errors.Is(err, context.Canceled) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if tunnel != nil {
|
|
t.Fatal("expected nil tunnel here")
|
|
}
|
|
}
|
|
|
|
func TestTorTunnel(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel()
|
|
tunnel, err := tunnel.Start(ctx, tunnel.Config{
|
|
Name: "tor",
|
|
Session: &mockable.Session{
|
|
MockableLogger: log.Log,
|
|
},
|
|
})
|
|
if !errors.Is(err, context.Canceled) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if tunnel != nil {
|
|
t.Fatal("expected nil tunnel here")
|
|
}
|
|
}
|
|
|
|
func TestInvalidTunnel(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel()
|
|
tunnel, err := tunnel.Start(ctx, tunnel.Config{
|
|
Name: "antani",
|
|
Session: &mockable.Session{
|
|
MockableLogger: log.Log,
|
|
},
|
|
})
|
|
if err == nil || err.Error() != "unsupported tunnel" {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
t.Log(tunnel)
|
|
if tunnel != nil {
|
|
t.Fatal("expected nil tunnel here")
|
|
}
|
|
}
|