rpcsrv: add close of http server in tests

The HTTP server should be closed at the end of the test to prevent fd leak. Refs #3300 Close #3312 Close #2956 Close #3005 Ref #2958 Signed-off-by: Ekaterina Pavlova <[email protected]>
nspcc-dev · Mar 5, 2024 · 4f9a098 · 4f9a098
1 parent a504738
commit 4f9a098
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/pkg/rpcclient/wsclient_test.go b/pkg/rpcclient/wsclient_test.go
@@ -276,6 +276,7 @@ func TestWSClientEvents(t *testing.T) {
 	require.False(t, ok)
 	_, ok = <-ntfCh
 	require.False(t, ok)
+	t.Cleanup(srv.Close)
 }
 
 func TestWSClientNonBlockingEvents(t *testing.T) {
@@ -314,6 +315,7 @@ func TestWSClientNonBlockingEvents(t *testing.T) {
 			return
 		}
 	}))
+	t.Cleanup(srv.Close)
 	wsc, err := NewWS(context.TODO(), httpURLtoWS(srv.URL), WSOptions{CloseNotificationChannelIfFull: true})
 	require.NoError(t, err)
 	wsc.getNextRequestID = getTestRequestID
@@ -744,6 +746,7 @@ func TestWSFilteredSubscriptions(t *testing.T) {
 					ws.Close()
 				}
 			}))
+			t.Cleanup(srv.Close)
 			wsc, err := NewWS(context.TODO(), httpURLtoWS(srv.URL), WSOptions{})
 			require.NoError(t, err)
 			wsc.getNextRequestID = getTestRequestID

diff --git a/pkg/services/rpcsrv/client_test.go b/pkg/services/rpcsrv/client_test.go
@@ -1701,6 +1701,7 @@ func TestClient_Iterator_SessionConfigVariations(t *testing.T) {
 		rpcSrv.Start()
 		handler := http.HandlerFunc(rpcSrv.handleHTTPRequest)
 		httpSrv := httptest.NewServer(handler)
+		t.Cleanup(httpSrv.Close)
 		defer rpcSrv.Shutdown()
 		for _, b := range getTestBlocks(t) {
 			require.NoError(t, chain.AddBlock(b))

diff --git a/pkg/services/rpcsrv/server_helper_test.go b/pkg/services/rpcsrv/server_helper_test.go
@@ -130,7 +130,7 @@ func wrapUnitTestChain(t testing.TB, chain *core.Blockchain, orc OracleHandler,
 
 	handler := http.HandlerFunc(rpcServer.handleHTTPRequest)
 	srv := httptest.NewServer(handler)
-
+	t.Cleanup(srv.Close)
 	return chain, &rpcServer, srv
 }