TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

rpcsrv: properly cleanup network server in tests

Browse source 
Port the idea of https://github.com/nspcc-dev/neo-go/pull/3380.

Signed-off-by: Anna Shaleva <shaleva.ann@nspcc.ru>
This commit is contained in:
Anna Shaleva 2024-04-01 18:06:08 +03:00
parent 57d82c1281
commit 5b30d15f8e
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/services/rpcsrv/subscription_test.go
View file

@ -57,7 +57,7 @@ func getNotification(t *testing.T, respCh <-chan []byte) *neorpc.Notification {
return resp return resp
} }
func initCleanServerAndWSClient(t *testing.T) (*core.Blockchain, *Server, *websocket.Conn, chan []byte) { func initCleanServerAndWSClient(t *testing.T, startNetworkServer ...bool) (*core.Blockchain, *Server, *websocket.Conn, chan []byte) {
chain, rpcSrv, httpSrv := initClearServerWithInMemoryChain(t) chain, rpcSrv, httpSrv := initClearServerWithInMemoryChain(t)
dialer := websocket.Dialer{HandshakeTimeout: 5 * time.Second} dialer := websocket.Dialer{HandshakeTimeout: 5 * time.Second}
@ -72,10 +72,16 @@ func initCleanServerAndWSClient(t *testing.T) (*core.Blockchain, *Server, *webso
finishedFlag := &atomic.Bool{} finishedFlag := &atomic.Bool{}
readerToExitCh := make(chan struct{}) readerToExitCh := make(chan struct{})
go wsReader(t, ws, respMsgs, finishedFlag, readerToExitCh) go wsReader(t, ws, respMsgs, finishedFlag, readerToExitCh)
if len(startNetworkServer) != 0 && startNetworkServer[0] {
rpcSrv.coreServer.Start()
}
t.Cleanup(func() { t.Cleanup(func() {
finishedFlag.Store(true) finishedFlag.Store(true)
<-readerToExitCh <-readerToExitCh
ws.Close() ws.Close()
if len(startNetworkServer) != 0 && startNetworkServer[0] {
rpcSrv.coreServer.Shutdown()
}
}) })
return chain, rpcSrv, ws, respMsgs return chain, rpcSrv, ws, respMsgs
} }
@ -102,9 +108,7 @@ func TestSubscriptions(t *testing.T) {
var subIDs = make([]string, 0) var subIDs = make([]string, 0)
var subFeeds = []string{"block_added", "transaction_added", "notification_from_execution", "transaction_executed", "notary_request_event", "header_of_added_block"} var subFeeds = []string{"block_added", "transaction_added", "notification_from_execution", "transaction_executed", "notary_request_event", "header_of_added_block"}
chain, rpcSrv, c, respMsgs := initCleanServerAndWSClient(t) chain, rpcSrv, c, respMsgs := initCleanServerAndWSClient(t, true)
rpcSrv.coreServer.Start()
defer rpcSrv.coreServer.Shutdown()
for _, feed := range subFeeds { for _, feed := range subFeeds {
s := callSubscribe(t, c, respMsgs, fmt.Sprintf(`["%s"]`, feed)) s := callSubscribe(t, c, respMsgs, fmt.Sprintf(`["%s"]`, feed))
@ -391,8 +395,7 @@ func TestFilteredNotaryRequestSubscriptions(t *testing.T) {
}, },
} }
chain, rpcSrv, c, respMsgs := initCleanServerAndWSClient(t) chain, rpcSrv, c, respMsgs := initCleanServerAndWSClient(t, true)
rpcSrv.coreServer.Start()
// blocks are needed to make GAS deposit for priv0 // blocks are needed to make GAS deposit for priv0
blocks := getTestBlocks(t) blocks := getTestBlocks(t)