cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix testServ to Start with correct listener

Browse Source
This commit is contained in:
Anton Evangelatov 2021-07-06 17:57:08 +02:00
parent 7a78527fde
commit 2a7af38538
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
itests/kit/rpc.go
View File

@ -16,10 +16,12 @@ import (
) )
func CreateRPCServer(t *testing.T, handler http.Handler, listener net.Listener) (*httptest.Server, multiaddr.Multiaddr) { func CreateRPCServer(t *testing.T, handler http.Handler, listener net.Listener) (*httptest.Server, multiaddr.Multiaddr) {
testServ := httptest.NewServer(handler) testServ := &httptest.Server{
if listener != nil { Listener: listener,
testServ.Listener = listener Config: &http.Server{Handler: handler},
} }
testServ.Start()
t.Cleanup(testServ.Close) t.Cleanup(testServ.Close)
t.Cleanup(testServ.CloseClientConnections) t.Cleanup(testServ.CloseClientConnections)
@ -33,7 +35,10 @@ func fullRpc(t *testing.T, f *TestFullNode) *TestFullNode {
handler, err := node.FullNodeHandler(f.FullNode, false) handler, err := node.FullNodeHandler(f.FullNode, false)
require.NoError(t, err) require.NoError(t, err)
srv, maddr := CreateRPCServer(t, handler, nil) l, err := net.Listen("tcp", "127.0.0.1:0")
require.NoError(t, err)
srv, maddr := CreateRPCServer(t, handler, l)
cl, stop, err := client.NewFullNodeRPCV1(context.Background(), "ws://"+srv.Listener.Addr().String()+"/rpc/v1", nil) cl, stop, err := client.NewFullNodeRPCV1(context.Background(), "ws://"+srv.Listener.Addr().String()+"/rpc/v1", nil)
require.NoError(t, err) require.NoError(t, err)