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

fix(oonimkall): run tests with InputOrStaticDefault policy (#634)

Browse Source 
Previous work to make https://github.com/ooni/probe/issues/1814
possible has broken running stunreachability on mobile.

This diff repairs the blunder and allows to run any experiment
using InputOrStaticDefault with oonimkall.

Diff extracted from https://github.com/ooni/probe-cli/pull/539.
This commit is contained in:
Simone Basso
2021-12-03 17:43:09 +01:00
committed by GitHub
parent 1896d2172a
commit dc9fbe9c64
3 changed files with 299 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/engine/inputloader.go
+3 -3
View File
@@ -183,10 +183,10 @@ var dnsCheckDefaultInput = []string{
var stunReachabilityDefaultInput = stuninput.AsnStunReachabilityInput()
// staticBareInputForExperiment returns the list of strings an
// StaticBareInputForExperiment returns the list of strings an
// experiment should use as static input. In case there is no
// static input for this experiment, we return an error.
func staticBareInputForExperiment(name string) ([]string, error) {
func StaticBareInputForExperiment(name string) ([]string, error) {
// Implementation note: we may be called from pkg/oonimkall
// with a non-canonical experiment name, so we need to convert
// the experiment name to be canonical before proceeding.
@@ -203,7 +203,7 @@ func staticBareInputForExperiment(name string) ([]string, error) {
// staticInputForExperiment returns the static input for the given experiment
// or an error if there's no static input for the experiment.
func staticInputForExperiment(name string) ([]model.URLInfo, error) {
return stringListToModelURLInfo(staticBareInputForExperiment(name))
return stringListToModelURLInfo(StaticBareInputForExperiment(name))
}
// loadOrStaticDefault implements the InputOrStaticDefault policy.