fix: disable maxRuntime when not WebConnectivity

See ooni/probe#1433
ooni · Apr 6, 2021 · 6306c09 · 6306c09
1 parent 51459e2
commit 6306c09
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/cmd/ooniprobe/internal/nettests/nettests.go b/cmd/ooniprobe/internal/nettests/nettests.go
@@ -120,6 +120,11 @@ func (c *Controller) Run(builder *engine.ExperimentBuilder, inputs []string) err
 		log.Debug("disabling maxRuntime when running in the background")
 		maxRuntime = 0
 	}
+	_, isWebConnectivity := c.nt.(WebConnectivity)
+	if !isWebConnectivity {
+		log.Debug("disabling maxRuntime without Web Connectivity")
+		maxRuntime = 0
+	}
 	start := time.Now()
 	c.ntStartTime = start
 	for idx, input := range inputs {
@@ -214,7 +219,8 @@ func (c *Controller) Run(builder *engine.ExperimentBuilder, inputs []string) err
 func (c *Controller) OnProgress(perc float64, msg string) {
 	// when we have maxRuntime, honor it
 	maxRuntime := time.Duration(c.Probe.Config().Nettests.WebsitesMaxRuntime) * time.Second
-	if c.RunType == "manual" && maxRuntime > 0 {
+	_, isWebConnectivity := c.nt.(WebConnectivity)
+	if c.RunType == "manual" && maxRuntime > 0 && isWebConnectivity {
 		elapsed := time.Since(c.ntStartTime)
 		perc = float64(elapsed) / float64(maxRuntime)
 		eta := maxRuntime.Seconds() - elapsed.Seconds()

diff --git a/internal/version/version.go b/internal/version/version.go
@@ -3,5 +3,5 @@ package version
 
 const (
 	// Version is the software version
-	Version = "3.9.0"
+	Version = "3.9.1"
 )