From 4578df0a2b7cadf0d21ef747110be0f0f2739db6 Mon Sep 17 00:00:00 2001
From: Simone Basso <bassosimone@gmail.com>
Date: Wed, 7 Apr 2021 14:55:04 +0200
Subject: [PATCH] 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.
---
 cmd/ooniprobe/internal/nettests/nettests.go         | 7 ++++++-
 cmd/ooniprobe/internal/nettests/web_connectivity.go | 1 -
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/cmd/ooniprobe/internal/nettests/nettests.go b/cmd/ooniprobe/internal/nettests/nettests.go
index 5e5f9f2..ff9d987 100644
--- a/cmd/ooniprobe/internal/nettests/nettests.go
+++ b/cmd/ooniprobe/internal/nettests/nettests.go
@@ -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()
diff --git a/cmd/ooniprobe/internal/nettests/web_connectivity.go b/cmd/ooniprobe/internal/nettests/web_connectivity.go
index 746e040..4ea021f 100644
--- a/cmd/ooniprobe/internal/nettests/web_connectivity.go
+++ b/cmd/ooniprobe/internal/nettests/web_connectivity.go
@@ -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