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
71 lines
1.8 KiB
Go
71 lines
1.8 KiB
Go
package ndt7
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/gorilla/websocket"
|
|
)
|
|
|
|
func TestDialDownloadWithCancelledContext(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // immediately halt
|
|
mgr := newDialManager("wss://hostname.fake", log.Log, "miniooni/0.1.0-dev")
|
|
conn, err := mgr.dialDownload(ctx)
|
|
if err == nil || !strings.HasSuffix(err.Error(), "operation was canceled") {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
}
|
|
|
|
func TestDialUploadWithCancelledContext(t *testing.T) {
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // immediately halt
|
|
mgr := newDialManager("wss://hostname.fake", log.Log, "miniooni/0.1.0-dev")
|
|
conn, err := mgr.dialUpload(ctx)
|
|
if err == nil || !strings.HasSuffix(err.Error(), "operation was canceled") {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
}
|
|
|
|
func TestDialIncludesUserAgent(t *testing.T) {
|
|
do := func(testName string) {
|
|
var userAgent string
|
|
handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
userAgent = r.UserAgent()
|
|
w.WriteHeader(500)
|
|
})
|
|
server := httptest.NewServer(handler)
|
|
defer server.Close()
|
|
url, err := url.Parse(server.URL)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
url.Scheme = "ws"
|
|
mgr := newDialManager(url.String(), log.Log, "miniooni/0.1.0-dev")
|
|
conn, err := mgr.dialWithTestName(context.Background(), testName)
|
|
if !errors.Is(err, websocket.ErrBadHandshake) {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if conn != nil {
|
|
t.Fatal("expected nil conn here")
|
|
}
|
|
if userAgent != "miniooni/0.1.0-dev" {
|
|
t.Fatal("User-Agent not sent")
|
|
}
|
|
}
|
|
do("download")
|
|
do("upload")
|
|
}
|