Skip to content

*: take care of test RPC server shutdown #4278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roman-khimov merged 1 commit into from
May 22, 2026
+3 −5
Merged

*: take care of test RPC server shutdown #4278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/rpcclient/local_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ func TestInternalClientCancel(t *testing.T) {
c.ApplicationConfiguration.Consensus.UnlockWallet.Path = "../../cli/testdata/wallet1_solo.json"
}, true)
t.Cleanup(func() {
netSrv.Shutdown()
rpcSrv.Shutdown()
netSrv.Shutdown()
bc.Close()
})
icl, err := rpcclient.NewInternal(ctx, rpcSrv.RegisterLocal)
Expand Down
6 changes: 2 additions & 4 deletions pkg/services/rpcsrv/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1823,7 +1823,7 @@ func TestClient_Iterator_SessionConfigVariations(t *testing.T) {
handler := http.HandlerFunc(rpcSrv.handleHTTPRequest)
httpSrv := httptest.NewServer(handler)
t.Cleanup(httpSrv.Close)
defer rpcSrv.Shutdown()
t.Cleanup(rpcSrv.Shutdown)
for _, b := range getTestBlocks(t) {
require.NoError(t, chain.AddBlock(b))
}
Expand Down Expand Up @@ -2766,9 +2766,7 @@ func TestClient_SessionExpansionExtension(t *testing.T) {
return bytes.Compare(a, b)
})
setup := func(t *testing.T, cfgMod func(*config.Config)) *rpcclient.Client {
chain, rpcSrv, httpSrv := initClearServerWithCustomConfig(t, cfgMod)
t.Cleanup(rpcSrv.Shutdown)
t.Cleanup(httpSrv.Close)
chain, _, httpSrv := initClearServerWithCustomConfig(t, cfgMod)

for _, b := range getTestBlocks(t) {
require.NoError(t, chain.AddBlock(b))
Expand Down
Loading