c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: merge probe-engine into probe-cli (#201)

Browse source 
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
This commit is contained in:
Simone Basso 2021-02-02 12:05:47 +01:00 • committed by GitHub
commit d57c78bc71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
535 changed files with 66182 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

232
internal/engine/internal/mlablocatev2/mlablocatev2_test.go Normal file
View file

@ -0,0 +1,232 @@
package mlablocatev2_test
import (
"context"
"errors"
"io"
"net/http"
"net/url"
"strings"
"testing"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/internal/mlablocatev2"
)
func TestSuccess(t *testing.T) {
if testing.Short() {
t.Skip("skip test in short mode")
}
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
result, err := client.QueryNDT7(context.Background())
if err != nil {
t.Fatal(err)
}
if len(result) <= 0 {
t.Fatal("unexpected empty result")
}
for _, entry := range result {
if entry.Hostname == "" {
t.Fatal("expected non empty Machine here")
}
if entry.Site == "" {
t.Fatal("expected non=-empty Site here")
}
if entry.WSSDownloadURL == "" {
t.Fatal("expected non-empty WSSDownloadURL here")
}
if _, err := url.Parse(entry.WSSDownloadURL); err != nil {
t.Fatal(err)
}
if entry.WSSUploadURL == "" {
t.Fatal("expected non-empty WSSUploadURL here")
}
if _, err := url.Parse(entry.WSSUploadURL); err != nil {
t.Fatal(err)
}
}
}
func Test404Response(t *testing.T) {
if testing.Short() {
t.Skip("skip test in short mode")
}
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
result, err := client.Query(context.Background(), "nonexistent")
if !errors.Is(err, mlablocatev2.ErrRequestFailed) {
t.Fatal("not the error we expected")
}
if result.Results != nil {
t.Fatal("expected empty results")
}
}
func TestNewRequestFailure(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
client.Hostname = "\t"
result, err := client.Query(context.Background(), "nonexistent")
if err == nil || !strings.Contains(err.Error(), "invalid URL escape") {
t.Fatal("not the error we expected")
}
if result.Results != nil {
t.Fatal("expected empty fqdn")
}
}
func TestHTTPClientDoFailure(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
expected := errors.New("mocked error")
client.HTTPClient = &http.Client{
Transport: mlablocatev2.FakeTransport{Err: expected},
}
result, err := client.Query(context.Background(), "nonexistent")
if !errors.Is(err, expected) {
t.Fatal("not the error we expected")
}
if result.Results != nil {
t.Fatal("expected empty fqdn")
}
}
func TestCannotReadBody(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
expected := errors.New("mocked error")
client.HTTPClient = &http.Client{
Transport: mlablocatev2.FakeTransport{
Resp: &http.Response{
StatusCode: 200,
Body: mlablocatev2.FakeBody{
Err: expected,
},
},
},
}
result, err := client.Query(context.Background(), "nonexistent")
if !errors.Is(err, expected) {
t.Fatal("not the error we expected")
}
if result.Results != nil {
t.Fatal("expected empty fqdn")
}
}
func TestInvalidJSON(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
client.HTTPClient = &http.Client{
Transport: mlablocatev2.FakeTransport{
Resp: &http.Response{
StatusCode: 200,
Body: mlablocatev2.FakeBody{
Err: io.EOF,
Data: []byte(`{`),
},
},
},
}
result, err := client.Query(context.Background(), "nonexistent")
if err == nil || !strings.Contains(err.Error(), "unexpected end of JSON input") {
t.Fatal("not the error we expected")
}
if result.Results != nil {
t.Fatal("expected empty fqdn")
}
}
func TestEmptyResponse(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
client.HTTPClient = &http.Client{
Transport: mlablocatev2.FakeTransport{
Resp: &http.Response{
StatusCode: 200,
Body: mlablocatev2.FakeBody{
Err: io.EOF,
Data: []byte(`{}`),
},
},
},
}
result, err := client.QueryNDT7(context.Background())
if !errors.Is(err, mlablocatev2.ErrEmptyResponse) {
t.Fatal("not the error we expected")
}
if result != nil {
t.Fatal("expected empty fqdn")
}
}
func TestNDT7QueryFails(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
client.HTTPClient = &http.Client{
Transport: mlablocatev2.FakeTransport{
Resp: &http.Response{
StatusCode: 404,
Body: mlablocatev2.FakeBody{Err: io.EOF},
},
},
}
result, err := client.QueryNDT7(context.Background())
if !errors.Is(err, mlablocatev2.ErrRequestFailed) {
t.Fatal("not the error we expected")
}
if result != nil {
t.Fatal("expected empty fqdn")
}
}
func TestNDT7InvalidURLs(t *testing.T) {
client := mlablocatev2.NewClient(http.DefaultClient, log.Log, "miniooni/0.1.0-dev")
client.HTTPClient = &http.Client{
Transport: mlablocatev2.FakeTransport{
Resp: &http.Response{
StatusCode: 200,
Body: mlablocatev2.FakeBody{
Data: []byte(
`{"results":[{"machine":"mlab3-mil04.mlab-oti.measurement-lab.org","urls":{"wss:///ndt/v7/download":":","wss:///ndt/v7/upload":":"}}]}`),
Err: io.EOF,
},
},
},
}
result, err := client.QueryNDT7(context.Background())
if !errors.Is(err, mlablocatev2.ErrEmptyResponse) {
t.Fatal("not the error we expected")
}
if result != nil {
t.Fatal("expected empty fqdn")
}
}
func TestEntryRecordSite(t *testing.T) {
type fields struct {
Machine string
URLs map[string]string
}
tests := []struct {
name string
fields fields
want string
}{{
name: "with invalid machine name",
fields: fields{
Machine: "ndt-iupui-mlab3-mil02.mlab-oti.measurement-lab.org",
},
want: "",
}, {
name: "with valid machine name",
fields: fields{
Machine: "mlab3-mil04.mlab-oti.measurement-lab.org",
},
want: "mil04",
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
er := mlablocatev2.EntryRecord{
Machine: tt.fields.Machine,
URLs: tt.fields.URLs,
}
if got := er.Site(); got != tt.want {
t.Errorf("entryRecord.Site() = %v, want %v", got, tt.want)
}
})
}
}