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
56 lines
1.4 KiB
Go
56 lines
1.4 KiB
Go
package webconnectivity_test
|
|
|
|
import (
|
|
"context"
|
|
"net/url"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
|
|
)
|
|
|
|
func TestConnectsSuccess(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
ctx := context.Background()
|
|
r := webconnectivity.Connects(ctx, webconnectivity.ConnectsConfig{
|
|
Session: newsession(t, false),
|
|
TargetURL: &url.URL{Scheme: "https", Host: "cloudflare-dns.com", Path: "/"},
|
|
URLGetterURLs: []string{
|
|
"tlshandshake://104.16.249.249:443", "tlshandshake://104.16.248.249:443",
|
|
"tlshandshake://[2606:4700::6810:f9f9]:443",
|
|
"tlshandshake://[2606:4700::6810:f8f9]:443",
|
|
},
|
|
})
|
|
if len(r.AllKeys) != 4 {
|
|
t.Fatal("unexpected number of TestKeys lists")
|
|
}
|
|
if r.Successes < 1 {
|
|
t.Fatal("no successes?!")
|
|
}
|
|
if r.Total != 4 {
|
|
t.Fatal("unexpected number of attempts")
|
|
}
|
|
}
|
|
|
|
func TestConnectsNoInput(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skip test in short mode")
|
|
}
|
|
ctx := context.Background()
|
|
r := webconnectivity.Connects(ctx, webconnectivity.ConnectsConfig{
|
|
Session: newsession(t, false),
|
|
TargetURL: &url.URL{Scheme: "https", Host: "cloudflare-dns.com", Path: "/"},
|
|
URLGetterURLs: []string{},
|
|
})
|
|
if len(r.AllKeys) != 0 {
|
|
t.Fatal("unexpected number of TestKeys lists")
|
|
}
|
|
if r.Successes != 0 {
|
|
t.Fatal("successes?!")
|
|
}
|
|
if r.Total != 0 {
|
|
t.Fatal("unexpected number of attempts")
|
|
}
|
|
}
|