veyron/lib/modules,veyron/services/node/impl: adjust subprocess timeout.
Revert the change I made in https://veyron-review.googlesource.com/7110, and
instead set the default timeout just for subprocesses started by the modules
library to 3 min. This leaves the overall test timeout at 10 min by default (for
node manager test run with --race, we already hit ~270s). If 3 min turns out to
be too much for all that use modules, we can later on add more
customization. For now, keep it simple.
Change-Id: Ifec94d8d9902bf50e2cd5aac50b8bed8c9fceff0
diff --git a/lib/modules/exec.go b/lib/modules/exec.go
index d34f534..8e2b6e6 100644
--- a/lib/modules/exec.go
+++ b/lib/modules/exec.go
@@ -45,8 +45,10 @@
// use supplied command value for subprocesses
fl = append(fl, "--test.timeout="+timeout.Value.String())
} else {
- // translate default value into 1m for subproccesses
- fl = append(fl, "--test.timeout=1m")
+ // translate default value into 3m for subproccesses. The
+ // default of 10m is too long to wait in order to find out that
+ // our subprocess is wedged.
+ fl = append(fl, "--test.timeout=3m")
}
return fl
}
diff --git a/services/mgmt/node/impl/impl_test.go b/services/mgmt/node/impl/impl_test.go
index 0baca5b..fa5cbef 100644
--- a/services/mgmt/node/impl/impl_test.go
+++ b/services/mgmt/node/impl/impl_test.go
@@ -10,7 +10,6 @@
"encoding/base64"
"encoding/hex"
"encoding/json"
- "flag"
"fmt"
"io"
"io/ioutil"
@@ -74,17 +73,6 @@
return
}
initRT()
-
- // NOTE(caprita): The default 1m timeout that the modules package gives
- // to subprocesses is insufficient, especially with --race.
- // If not explicitly set to a non-default value by the user, we set the
- // test-wide timeout to 2 minutes (which will get propagated by the
- // modules framework to the subprocesses).
- timeoutFlag := flag.Lookup("test.timeout")
- if timeoutFlag.Value.String() == timeoutFlag.DefValue {
- timeoutFlag.Value.Set("2m")
- vlog.Infof("Setting test.timeout to 2m.")
- }
}
func initRT() {
