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

fix(miniooni): replace --limit with --max-runtime (#272)

Browse source 
Part of https://github.com/ooni/probe/issues/1299
This commit is contained in:
Simone Basso 2021-03-29 20:38:23 +02:00 • committed by GitHub
commit a0763756b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 81 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

47
internal/engine/inputprocessor_test.go
View file

@ -4,13 +4,15 @@ import (
"context"
"errors"
"testing"
"time"
"github.com/ooni/probe-cli/v3/internal/engine/model"
)
type FakeInputProcessorExperiment struct {
Err error
M []*model.Measurement
SleepTime time.Duration
Err error
M []*model.Measurement
}
func (fipe *FakeInputProcessorExperiment) MeasureWithContext(
@ -18,6 +20,9 @@ func (fipe *FakeInputProcessorExperiment) MeasureWithContext(
if fipe.Err != nil {
return nil, fipe.Err
}
if fipe.SleepTime > 0 {
time.Sleep(fipe.SleepTime)
}
m := new(model.Measurement)
// Here we add annotations to ensure that the input processor
// is MERGING annotations as opposed to overwriting them.
@ -30,7 +35,7 @@ func (fipe *FakeInputProcessorExperiment) MeasureWithContext(
func TestInputProcessorMeasurementFailed(t *testing.T) {
expected := errors.New("mocked error")
ip := InputProcessor{
ip := &InputProcessor{
Experiment: NewInputProcessorExperimentWrapper(
&FakeInputProcessorExperiment{Err: expected},
),
@ -58,7 +63,7 @@ func (fips *FakeInputProcessorSubmitter) Submit(
func TestInputProcessorSubmissionFailed(t *testing.T) {
fipe := &FakeInputProcessorExperiment{}
expected := errors.New("mocked error")
ip := InputProcessor{
ip := &InputProcessor{
Annotations: map[string]string{
"foo": "bar",
},
@ -108,7 +113,7 @@ func (fips *FakeInputProcessorSaver) SaveMeasurement(m *model.Measurement) error
func TestInputProcessorSaveOnDiskFailed(t *testing.T) {
expected := errors.New("mocked error")
ip := InputProcessor{
ip := &InputProcessor{
Experiment: NewInputProcessorExperimentWrapper(
&FakeInputProcessorExperiment{},
),
@ -133,7 +138,7 @@ func TestInputProcessorGood(t *testing.T) {
fipe := &FakeInputProcessorExperiment{}
saver := &FakeInputProcessorSaver{Err: nil}
submitter := &FakeInputProcessorSubmitter{Err: nil}
ip := InputProcessor{
ip := &InputProcessor{
Experiment: NewInputProcessorExperimentWrapper(fipe),
Inputs: []model.URLInfo{{
URL: "https://www.kernel.org/",
@ -148,6 +153,9 @@ func TestInputProcessorGood(t *testing.T) {
if err := ip.Run(ctx); err != nil {
t.Fatal(err)
}
if ip.terminatedByMaxRuntime > 0 {
t.Fatal("terminated by max runtime!?")
}
if len(fipe.M) != 2 || len(saver.M) != 2 || len(submitter.M) != 2 {
t.Fatal("not all measurements saved")
}
@ -164,3 +172,30 @@ func TestInputProcessorGood(t *testing.T) {
t.Fatal("invalid saver.M[1].Input")
}
}
func TestInputProcessorMaxRuntime(t *testing.T) {
fipe := &FakeInputProcessorExperiment{
SleepTime: 50 * time.Millisecond,
}
saver := &FakeInputProcessorSaver{Err: nil}
submitter := &FakeInputProcessorSubmitter{Err: nil}
ip := &InputProcessor{
Experiment: NewInputProcessorExperimentWrapper(fipe),
Inputs: []model.URLInfo{{
URL: "https://www.kernel.org/",
}, {
URL: "https://www.slashdot.org/",
}},
MaxRuntime: 1 * time.Nanosecond,
Options: []string{"fake=true"},
Saver: NewInputProcessorSaverWrapper(saver),
Submitter: NewInputProcessorSubmitterWrapper(submitter),
}
ctx := context.Background()
if err := ip.Run(ctx); err != nil {
t.Fatal(err)
}
if ip.terminatedByMaxRuntime <= 0 {
t.Fatal("not terminated by max runtime")
}
}