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
62 lines
1.8 KiB
Go
62 lines
1.8 KiB
Go
package probeservices_test
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net/http"
|
|
"testing"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/kvstore"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
|
)
|
|
|
|
func TestCheckReportIDWorkingAsIntended(t *testing.T) {
|
|
client := probeservices.Client{
|
|
Client: httpx.Client{
|
|
BaseURL: "https://ams-pg.ooni.org/",
|
|
HTTPClient: http.DefaultClient,
|
|
Logger: log.Log,
|
|
UserAgent: "miniooni/0.1.0-dev",
|
|
},
|
|
LoginCalls: atomicx.NewInt64(),
|
|
RegisterCalls: atomicx.NewInt64(),
|
|
StateFile: probeservices.NewStateFile(kvstore.NewMemoryKeyValueStore()),
|
|
}
|
|
reportID := `20201209T052225Z_urlgetter_IT_30722_n1_E1VUhMz08SEkgYFU`
|
|
ctx := context.Background()
|
|
found, err := client.CheckReportID(ctx, reportID)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if found != true {
|
|
t.Fatal("unexpected found value")
|
|
}
|
|
}
|
|
|
|
func TestCheckReportIDWorkingWithCancelledContext(t *testing.T) {
|
|
client := probeservices.Client{
|
|
Client: httpx.Client{
|
|
BaseURL: "https://ams-pg.ooni.org/",
|
|
HTTPClient: http.DefaultClient,
|
|
Logger: log.Log,
|
|
UserAgent: "miniooni/0.1.0-dev",
|
|
},
|
|
LoginCalls: atomicx.NewInt64(),
|
|
RegisterCalls: atomicx.NewInt64(),
|
|
StateFile: probeservices.NewStateFile(kvstore.NewMemoryKeyValueStore()),
|
|
}
|
|
reportID := `20201209T052225Z_urlgetter_IT_30722_n1_E1VUhMz08SEkgYFU`
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
cancel() // fail immediately
|
|
found, err := client.CheckReportID(ctx, reportID)
|
|
if !errors.Is(err, context.Canceled) {
|
|
t.Fatalf("not the error we expected: %+v", err)
|
|
}
|
|
if found != false {
|
|
t.Fatal("unexpected found value")
|
|
}
|
|
}
|