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
47 lines
1.1 KiB
Go
47 lines
1.1 KiB
Go
package probeservices_test
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"testing"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices/testorchestra"
|
|
)
|
|
|
|
func TestFetchPsiphonConfig(t *testing.T) {
|
|
clnt := newclient()
|
|
if err := clnt.MaybeRegister(context.Background(), testorchestra.MetadataFixture()); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := clnt.MaybeLogin(context.Background()); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
data, err := clnt.FetchPsiphonConfig(context.Background())
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
var config interface{}
|
|
if err := json.Unmarshal(data, &config); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestFetchPsiphonConfigNotRegistered(t *testing.T) {
|
|
clnt := newclient()
|
|
state := probeservices.State{
|
|
// Explicitly empty so the test is more clear
|
|
}
|
|
if err := clnt.StateFile.Set(state); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
data, err := clnt.FetchPsiphonConfig(context.Background())
|
|
if !errors.Is(err, probeservices.ErrNotRegistered) {
|
|
t.Fatal("expected an error here")
|
|
}
|
|
if data != nil {
|
|
t.Fatal("expected nil data here")
|
|
}
|
|
}
|