Merge pull request #375 from etclabscore/merge/foundation-release/1.1…

…0.1-resolved-testcmd-timeout cmd/geth,internal/cmdtest: add KillTimeout field to TestCmd struct
etclabscore · May 11, 2021 · f912896 · f912896
2 parents b9a4ddd + de739a5
commit f912896
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cmd/geth/consolecmd_cg_test.go b/cmd/geth/consolecmd_cg_test.go
@@ -160,6 +160,7 @@ func TestGethStartupLogs(t *testing.T) {
 	for i, c := range cases {
 		t.Run(fmt.Sprintf("TestGethStartupLogs/%d: %v", i, c.flags), func(t *testing.T) {
 			geth := runGeth(t, append(c.flags, "--exec", "admin.nodeInfo.name", "console")...)
+			geth.KillTimeout = 10 * time.Second
 			geth.ExpectRegexp("(?ism).*CoreGeth.*")
 			geth.ExpectExit()
 			if status := geth.ExitStatus(); status != 0 {

diff --git a/internal/cmdtest/test_cmd.go b/internal/cmdtest/test_cmd.go
@@ -37,16 +37,17 @@ import (
 )
 
 func NewTestCmd(t *testing.T, data interface{}) *TestCmd {
-	return &TestCmd{T: t, Data: data}
+	return &TestCmd{T: t, Data: data, KillTimeout: 5 * time.Second}
 }
 
 type TestCmd struct {
 	// For total convenience, all testing methods are available.
 	*testing.T
 
-	Func    template.FuncMap
-	Data    interface{}
-	Cleanup func()
+	Func        template.FuncMap
+	Data        interface{}
+	Cleanup     func()
+	KillTimeout time.Duration
 
 	cmd    *exec.Cmd
 	stdout *bufio.Reader
@@ -231,7 +232,7 @@ func (tt *TestCmd) Kill() {
 }
 
 func (tt *TestCmd) withKillTimeout(fn func()) {
-	timeout := time.AfterFunc(5*time.Second, func() {
+	timeout := time.AfterFunc(tt.KillTimeout, func() {
 		tt.Log("killing the child process (timeout)")
 		tt.Kill()
 	})