chore: merge probe-engine into probe-cli (#201)
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:
parent
b1ce300c8d
commit
d57c78bc71
535 changed files with 66182 additions and 23 deletions
316
internal/engine/inputloader_integration_test.go
Normal file
316
internal/engine/inputloader_integration_test.go
Normal file
|
|
@ -0,0 +1,316 @@
|
|||
package engine_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"syscall"
|
||||
"testing"
|
||||
|
||||
"github.com/apex/log"
|
||||
"github.com/google/go-cmp/cmp"
|
||||
engine "github.com/ooni/probe-cli/v3/internal/engine"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/internal/kvstore"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
||||
)
|
||||
|
||||
func TestInputLoaderInputNoneWithStaticInputs(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
StaticInputs: []string{"https://www.google.com/"},
|
||||
InputPolicy: engine.InputNone,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, engine.ErrNoInputExpected) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputNoneWithFilesInputs(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
InputPolicy: engine.InputNone,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, engine.ErrNoInputExpected) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputNoneWithBothInputs(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
StaticInputs: []string{"https://www.google.com/"},
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
InputPolicy: engine.InputNone,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, engine.ErrNoInputExpected) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputNoneWithNoInput(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputNone,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(out) != 1 || out[0].URL != "" {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOptionalWithNoInput(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputOptional,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(out) != 1 || out[0].URL != "" {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOptionalWithInput(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
StaticInputs: []string{"https://www.google.com/"},
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
InputPolicy: engine.InputOptional,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(out) != 5 {
|
||||
t.Fatal("not the output length we expected")
|
||||
}
|
||||
expect := []model.URLInfo{
|
||||
{URL: "https://www.google.com/"},
|
||||
{URL: "https://www.x.org/"},
|
||||
{URL: "https://www.slashdot.org/"},
|
||||
{URL: "https://abc.xyz/"},
|
||||
{URL: "https://run.ooni.io/"},
|
||||
}
|
||||
if diff := cmp.Diff(out, expect); diff != "" {
|
||||
t.Fatal(diff)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOptionalNonexistentFile(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
StaticInputs: []string{"https://www.google.com/"},
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"/nonexistent",
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
InputPolicy: engine.InputOptional,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, syscall.ENOENT) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputStrictlyRequiredWithInput(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
StaticInputs: []string{"https://www.google.com/"},
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
InputPolicy: engine.InputStrictlyRequired,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(out) != 5 {
|
||||
t.Fatal("not the output length we expected")
|
||||
}
|
||||
expect := []model.URLInfo{
|
||||
{URL: "https://www.google.com/"},
|
||||
{URL: "https://www.x.org/"},
|
||||
{URL: "https://www.slashdot.org/"},
|
||||
{URL: "https://abc.xyz/"},
|
||||
{URL: "https://run.ooni.io/"},
|
||||
}
|
||||
if diff := cmp.Diff(out, expect); diff != "" {
|
||||
t.Fatal(diff)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputStrictlyRequiredWithoutInput(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputStrictlyRequired,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, engine.ErrInputRequired) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputStrictlyRequiredWithEmptyFile(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputStrictlyRequired,
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader3.txt", // we want it before inputloader2.txt
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, engine.ErrDetectedEmptyFile) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOrQueryTestListsWithInput(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
StaticInputs: []string{"https://www.google.com/"},
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
InputPolicy: engine.InputOrQueryTestLists,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(out) != 5 {
|
||||
t.Fatal("not the output length we expected")
|
||||
}
|
||||
expect := []model.URLInfo{
|
||||
{URL: "https://www.google.com/"},
|
||||
{URL: "https://www.x.org/"},
|
||||
{URL: "https://www.slashdot.org/"},
|
||||
{URL: "https://abc.xyz/"},
|
||||
{URL: "https://run.ooni.io/"},
|
||||
}
|
||||
if diff := cmp.Diff(out, expect); diff != "" {
|
||||
t.Fatal(diff)
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOrQueryTestListsWithNoInputAndCancelledContext(t *testing.T) {
|
||||
sess, err := engine.NewSession(engine.SessionConfig{
|
||||
AssetsDir: "testdata",
|
||||
KVStore: kvstore.NewMemoryKeyValueStore(),
|
||||
Logger: log.Log,
|
||||
SoftwareName: "miniooni",
|
||||
SoftwareVersion: "0.1.0-dev",
|
||||
TempDir: "testdata",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer sess.Close()
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputOrQueryTestLists,
|
||||
Session: sess,
|
||||
})
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
cancel() // fail immediately
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, context.Canceled) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOrQueryTestListsWithNoInput(t *testing.T) {
|
||||
if testing.Short() {
|
||||
t.Skip("skip test in short mode")
|
||||
}
|
||||
sess, err := engine.NewSession(engine.SessionConfig{
|
||||
AvailableProbeServices: []model.Service{{
|
||||
Address: "https://ams-pg-test.ooni.org/",
|
||||
Type: "https",
|
||||
}},
|
||||
AssetsDir: "testdata",
|
||||
KVStore: kvstore.NewMemoryKeyValueStore(),
|
||||
Logger: log.Log,
|
||||
SoftwareName: "miniooni",
|
||||
SoftwareVersion: "0.1.0-dev",
|
||||
TempDir: "testdata",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
defer sess.Close()
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputOrQueryTestLists,
|
||||
Session: sess,
|
||||
URLLimit: 30,
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(out) < 10 {
|
||||
t.Fatal("not the output length we expected")
|
||||
}
|
||||
}
|
||||
|
||||
func TestInputLoaderInputOrQueryTestListsWithEmptyFile(t *testing.T) {
|
||||
il := engine.NewInputLoader(engine.InputLoaderConfig{
|
||||
InputPolicy: engine.InputOrQueryTestLists,
|
||||
SourceFiles: []string{
|
||||
"testdata/inputloader1.txt",
|
||||
"testdata/inputloader3.txt", // we want it before inputloader2.txt
|
||||
"testdata/inputloader2.txt",
|
||||
},
|
||||
})
|
||||
ctx := context.Background()
|
||||
out, err := il.Load(ctx)
|
||||
if !errors.Is(err, engine.ErrDetectedEmptyFile) {
|
||||
t.Fatalf("not the error we expected: %+v", err)
|
||||
}
|
||||
if out != nil {
|
||||
t.Fatal("not the output we expected")
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue