From c508a368272fba03e30a5dcd5234df36ab9456dd Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 22 Apr 2020 17:43:50 +0300 Subject: [PATCH] core,network: shutdown services in tests properly --- pkg/core/helper_test.go | 1 + pkg/network/server_test.go | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pkg/core/helper_test.go b/pkg/core/helper_test.go index 3223cf4ba..b98457318 100644 --- a/pkg/core/helper_test.go +++ b/pkg/core/helper_test.go @@ -203,6 +203,7 @@ func TestCreateBasicChain(t *testing.T) { var neoAmount = util.Fixed8FromInt64(99999000) var neoRemainder = util.Fixed8FromInt64(100000000) - neoAmount bc := newTestChain(t) + defer bc.Close() // Move almost all NEO to one simple account. txMoveNeo := transaction.NewContractTX() diff --git a/pkg/network/server_test.go b/pkg/network/server_test.go index 5c68c4efd..4584a04a4 100644 --- a/pkg/network/server_test.go +++ b/pkg/network/server_test.go @@ -59,7 +59,16 @@ func TestServerNotSendsVerack(t *testing.T) { p2 = newLocalPeer(t, s) ) s.id = 1 - go s.run() + finished := make(chan struct{}) + go func() { + s.run() + close(finished) + }() + defer func() { + // close via quit as server was started via `run()`, not `Start()` + close(s.quit) + <-finished + }() na, _ := net.ResolveTCPAddr("tcp", "0.0.0.0:3000") p.netaddr = *na