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
73 lines
1.9 KiB
Go
73 lines
1.9 KiB
Go
package probeservices_test
|
|
|
|
import (
|
|
"context"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
)
|
|
|
|
func TestCheckInSuccess(t *testing.T) {
|
|
client := newclient()
|
|
client.BaseURL = "https://ams-pg-test.ooni.org"
|
|
config := model.CheckInConfig{
|
|
Charging: true,
|
|
OnWiFi: true,
|
|
Platform: "android",
|
|
ProbeASN: "AS12353",
|
|
ProbeCC: "PT",
|
|
RunType: "timed",
|
|
SoftwareName: "ooniprobe-android",
|
|
SoftwareVersion: "2.7.1",
|
|
WebConnectivity: model.CheckInConfigWebConnectivity{
|
|
CategoryCodes: []string{"NEWS", "CULTR"},
|
|
},
|
|
}
|
|
ctx := context.Background()
|
|
result, err := client.CheckIn(ctx, config)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if result == nil || result.WebConnectivity == nil {
|
|
t.Fatal("got nil result or WebConnectivity")
|
|
}
|
|
if result.WebConnectivity.ReportID == "" {
|
|
t.Fatal("ReportID is empty")
|
|
}
|
|
if len(result.WebConnectivity.URLs) < 1 {
|
|
t.Fatal("unexpected number of URLs")
|
|
}
|
|
for _, entry := range result.WebConnectivity.URLs {
|
|
if entry.CategoryCode != "NEWS" && entry.CategoryCode != "CULTR" {
|
|
t.Fatalf("unexpected category code: %+v", entry)
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestCheckInFailure(t *testing.T) {
|
|
client := newclient()
|
|
client.BaseURL = "https://\t\t\t/" // cause test to fail
|
|
config := model.CheckInConfig{
|
|
Charging: true,
|
|
OnWiFi: true,
|
|
Platform: "android",
|
|
ProbeASN: "AS12353",
|
|
ProbeCC: "PT",
|
|
RunType: "timed",
|
|
SoftwareName: "ooniprobe-android",
|
|
SoftwareVersion: "2.7.1",
|
|
WebConnectivity: model.CheckInConfigWebConnectivity{
|
|
CategoryCodes: []string{"NEWS", "CULTR"},
|
|
},
|
|
}
|
|
ctx := context.Background()
|
|
result, err := client.CheckIn(ctx, config)
|
|
if err == nil || !strings.HasSuffix(err.Error(), "invalid control character in URL") {
|
|
t.Fatal("not the error we expected")
|
|
}
|
|
if result != nil {
|
|
t.Fatal("results?!")
|
|
}
|
|
}
|