From f3e1ffe36a8e8dbcf8e46b7c63c3a0223adc59f9 Mon Sep 17 00:00:00 2001 From: jsvisa Date: Tue, 11 Apr 2023 10:13:21 +0800 Subject: [PATCH 1/3] rpc: increase subscribeTimeout from 5s to 10s Signed-off-by: jsvisa --- rpc/client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpc/client.go b/rpc/client.go index 69ff4851e317..624bb5b624b7 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -43,7 +43,7 @@ var ( const ( // Timeouts defaultDialTimeout = 10 * time.Second // used if context has no deadline - subscribeTimeout = 5 * time.Second // overall timeout eth_subscribe, rpc_modules calls + subscribeTimeout = 10 * time.Second // overall timeout eth_subscribe, rpc_modules calls ) const ( From 865fdd4a4604153942352d9c7811de616de20aa9 Mon Sep 17 00:00:00 2001 From: jsvisa Date: Tue, 11 Apr 2023 10:13:41 +0800 Subject: [PATCH 2/3] internal/cmdtest: increase kill timeout from 5s to 30s Signed-off-by: jsvisa --- internal/cmdtest/test_cmd.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/cmdtest/test_cmd.go b/internal/cmdtest/test_cmd.go index fd7a4a8b7f4c..df5107952e51 100644 --- a/internal/cmdtest/test_cmd.go +++ b/internal/cmdtest/test_cmd.go @@ -237,7 +237,7 @@ func (tt *TestCmd) Kill() { } func (tt *TestCmd) withKillTimeout(fn func()) { - timeout := time.AfterFunc(5*time.Second, func() { + timeout := time.AfterFunc(30*time.Second, func() { tt.Log("killing the child process (timeout)") tt.Kill() }) From 559c449266506841da029cdc00ff9e80f3b58fbb Mon Sep 17 00:00:00 2001 From: jsvisa Date: Tue, 9 May 2023 18:22:25 +0800 Subject: [PATCH 3/3] cmd/geth: kill the test in attach testing Signed-off-by: jsvisa --- cmd/geth/consolecmd_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 46bdf3c90d9f..5046906c0a9c 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -116,7 +116,7 @@ func TestAttachWelcome(t *testing.T) { waitForEndpoint(t, endpoint, 3*time.Second) testAttachWelcome(t, geth, endpoint, httpAPIs) }) - geth.ExpectExit() + geth.Kill() } func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) {