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

refactor(ooni): introduce interfaces for testability

Browse source
This commit is contained in:
Simone Basso 2020-11-13 20:07:30 +01:00
commit fa803300bb
13 changed files with 129 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/cli/run/run.go
View file

@ -31,7 +31,7 @@ func runNettestGroup(tg string, ctx *ooni.Probe, network *database.Network) erro
log.WithError(err).Error("Failed to lookup the location of the probe")
return err
}
network, err = database.CreateNetwork(ctx.DB, sess)
network, err = database.CreateNetwork(ctx.DB(), sess)
if err != nil {
log.WithError(err).Error("Failed to create the network row")
return err
@ -48,7 +48,7 @@ func runNettestGroup(tg string, ctx *ooni.Probe, network *database.Network) erro
}
log.Debugf("Running test group %s", group.Label)
result, err := database.CreateResult(ctx.DB, ctx.Home, tg, network.ID)
result, err := database.CreateResult(ctx.DB(), ctx.Home(), tg, network.ID)
if err != nil {
log.Errorf("DB result error: %s", err)
return err
@ -69,7 +69,7 @@ func runNettestGroup(tg string, ctx *ooni.Probe, network *database.Network) erro
}
}
if err = result.Finished(ctx.DB); err != nil {
if err = result.Finished(ctx.DB()); err != nil {
return err
}
return nil
@ -102,7 +102,7 @@ func init() {
}
if *noCollector == true {
probe.Config.Sharing.UploadResults = false
probe.Config().Sharing.UploadResults = false
}
return nil
})