c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ooniprobe): Measure returns EITHER measurement OR error now (#544)

Browse Source 
See https://github.com/ooni/probe/issues/1816

This diff addresses the most immediate issue but there is probably
extra work to do, including testing and making sure experiments
do not return an error when they should not.
This commit is contained in:
Simone Basso 2021-10-14 12:16:55 +02:00 committed by GitHub
parent 4b8cae692b
commit 730b00ff73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/ooniprobe/internal/nettests/nettests.go
View File

@ -165,10 +165,14 @@ func (c *Controller) Run(builder *engine.ExperimentBuilder, inputs []string) err
if err := c.msmts[idx64].Failed(c.Probe.DB(), err.Error()); err != nil {
return errors.Wrap(err, "failed to mark measurement as failed")
}
// Even with a failed measurement, we want to continue. We want to
// record and submit the information we have. Saving the information
// is useful for local inspection. Submitting it is useful to us to
// understand what went wrong (censorship? bug? anomaly?).
// Since https://github.com/ooni/probe-cli/pull/527, the Measure
// function returns EITHER a valid measurement OR an error. Before
// that, instead, the measurement was valid EVEN in case of an
// error, which is quite not the <value> OR <error> semantics that
// is so typical and widespread in the Go ecosystem. So, we must
// jump to the next iteration of the loop here rather than falling
// through and attempting to do something with the measurement.
continue
}
saveToDisk := true