From 433937fb42a1cb43fda247313797874e92d3c9fe Mon Sep 17 00:00:00 2001 From: Guillaume Ballet Date: Mon, 6 Jan 2020 12:07:21 +0100 Subject: [PATCH] cmd/geth: fix forked exe leak in console tests (#20480) --- cmd/geth/consolecmd_test.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 33c83b7ede..45d4daff07 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -87,11 +87,14 @@ func TestIPCAttachWelcome(t *testing.T) { "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--shh", "--ipcpath", ipc) + defer func() { + geth.Interrupt() + geth.ExpectExit() + }() + waitForEndpoint(t, ipc, 3*time.Second) testAttachWelcome(t, geth, "ipc:"+ipc, ipcAPIs) - geth.Interrupt() - geth.ExpectExit() } func TestHTTPAttachWelcome(t *testing.T) { @@ -100,13 +103,14 @@ func TestHTTPAttachWelcome(t *testing.T) { geth := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--rpc", "--rpcport", port) + defer func() { + geth.Interrupt() + geth.ExpectExit() + }() endpoint := "http://127.0.0.1:" + port waitForEndpoint(t, endpoint, 3*time.Second) testAttachWelcome(t, geth, endpoint, httpAPIs) - - geth.Interrupt() - geth.ExpectExit() } func TestWSAttachWelcome(t *testing.T) { @@ -116,13 +120,14 @@ func TestWSAttachWelcome(t *testing.T) { geth := runGeth(t, "--port", "0", "--maxpeers", "0", "--nodiscover", "--nat", "none", "--etherbase", coinbase, "--ws", "--wsport", port) + defer func() { + geth.Interrupt() + geth.ExpectExit() + }() endpoint := "ws://127.0.0.1:" + port waitForEndpoint(t, endpoint, 3*time.Second) testAttachWelcome(t, geth, endpoint, httpAPIs) - - geth.Interrupt() - geth.ExpectExit() } func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) {