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

more reliably close in tests

Browse Source
This commit is contained in:
Steven Allen 2021-01-20 18:17:41 -08:00
parent fe5b5702f9
commit 026d236252
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/lotus-gateway/endtoend_test.go
View File

@ -245,7 +245,7 @@ func startNodes(
// Create a gateway server in front of the full node // Create a gateway server in front of the full node
gapiImpl := newGatewayAPI(fullNode, lookbackCap, stateWaitLookbackLimit) gapiImpl := newGatewayAPI(fullNode, lookbackCap, stateWaitLookbackLimit)
_, addr, err := builder.CreateRPCServer(gapiImpl) _, addr, err := builder.CreateRPCServer(t, gapiImpl)
require.NoError(t, err) require.NoError(t, err)
// Create a gateway client API that connects to the gateway server // Create a gateway client API that connects to the gateway server

16
node/test/builder.go
View File

@ -491,34 +491,40 @@ func mockSbBuilderOpts(t *testing.T, fullOpts []test.FullNodeOpts, storage []tes
} }
func fullRpc(t *testing.T, nd test.TestNode) test.TestNode { func fullRpc(t *testing.T, nd test.TestNode) test.TestNode {
ma, listenAddr, err := CreateRPCServer(nd) ma, listenAddr, err := CreateRPCServer(t, nd)
require.NoError(t, err) require.NoError(t, err)
var stop func()
var full test.TestNode var full test.TestNode
full.FullNode, _, err = client.NewFullNodeRPC(context.Background(), listenAddr, nil) full.FullNode, stop, err = client.NewFullNodeRPC(context.Background(), listenAddr, nil)
require.NoError(t, err) require.NoError(t, err)
t.Cleanup(stop)
full.ListenAddr = ma full.ListenAddr = ma
return full return full
} }
func storerRpc(t *testing.T, nd test.TestStorageNode) test.TestStorageNode { func storerRpc(t *testing.T, nd test.TestStorageNode) test.TestStorageNode {
ma, listenAddr, err := CreateRPCServer(nd) ma, listenAddr, err := CreateRPCServer(t, nd)
require.NoError(t, err) require.NoError(t, err)
var stop func()
var storer test.TestStorageNode var storer test.TestStorageNode
storer.StorageMiner, _, err = client.NewStorageMinerRPC(context.Background(), listenAddr, nil) storer.StorageMiner, stop, err = client.NewStorageMinerRPC(context.Background(), listenAddr, nil)
require.NoError(t, err) require.NoError(t, err)
t.Cleanup(stop)
storer.ListenAddr = ma storer.ListenAddr = ma
storer.MineOne = nd.MineOne storer.MineOne = nd.MineOne
return storer return storer
} }
func CreateRPCServer(handler interface{}) (multiaddr.Multiaddr, string, error) { func CreateRPCServer(t *testing.T, handler interface{}) (multiaddr.Multiaddr, string, error) {
rpcServer := jsonrpc.NewServer() rpcServer := jsonrpc.NewServer()
rpcServer.Register("Filecoin", handler) rpcServer.Register("Filecoin", handler)
testServ := httptest.NewServer(rpcServer) // todo: close testServ := httptest.NewServer(rpcServer) // todo: close
t.Cleanup(testServ.Close)
t.Cleanup(testServ.CloseClientConnections)
addr := testServ.Listener.Addr() addr := testServ.Listener.Addr()
listenAddr := "ws://" + addr.String() listenAddr := "ws://" + addr.String()