fix: disable maxRuntime with --input or --input-file (#305)
When this happens, the user is expressing the intention of explicitly testing all the input they provided. So, disable maxRuntime in these cases. Part of https://github.com/ooni/probe/issues/1436.
This commit is contained in:
parent
654441f5cd
commit
4578df0a2b
|
@ -125,6 +125,10 @@ func (c *Controller) Run(builder *engine.ExperimentBuilder, inputs []string) err
|
|||
log.Debug("disabling maxRuntime without Web Connectivity")
|
||||
maxRuntime = 0
|
||||
}
|
||||
if len(c.Inputs) > 0 || len(c.InputFiles) > 0 {
|
||||
log.Debug("disabling maxRuntime with user-provided input")
|
||||
maxRuntime = 0
|
||||
}
|
||||
start := time.Now()
|
||||
c.ntStartTime = start
|
||||
for idx, input := range inputs {
|
||||
|
@ -220,7 +224,8 @@ func (c *Controller) OnProgress(perc float64, msg string) {
|
|||
// when we have maxRuntime, honor it
|
||||
maxRuntime := time.Duration(c.Probe.Config().Nettests.WebsitesMaxRuntime) * time.Second
|
||||
_, isWebConnectivity := c.nt.(WebConnectivity)
|
||||
if c.RunType == "manual" && maxRuntime > 0 && isWebConnectivity {
|
||||
userProvidedInput := len(c.Inputs) > 0 || len(c.InputFiles) > 0
|
||||
if c.RunType == "manual" && maxRuntime > 0 && isWebConnectivity && !userProvidedInput {
|
||||
elapsed := time.Since(c.ntStartTime)
|
||||
perc = float64(elapsed) / float64(maxRuntime)
|
||||
eta := maxRuntime.Seconds() - elapsed.Seconds()
|
||||
|
|
|
@ -27,7 +27,6 @@ func lookupURLs(ctl *Controller, categories []string) ([]string, map[int64]int64
|
|||
SourceFiles: ctl.InputFiles,
|
||||
StaticInputs: ctl.Inputs,
|
||||
}
|
||||
log.Infof("Calling CheckIn API with %s runType", ctl.RunType)
|
||||
testlist, err := inputloader.Load(context.Background())
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
|
|
Loading…
Reference in New Issue
Block a user