aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

Merge pull request #2259 from nspcc-dev/fix-some-tests

Browse source 
Fix some tests
This commit is contained in:
Roman Khimov 2021-11-15 15:53:13 +03:00 committed by GitHub
commit 0e1fe2f58b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkg/network/server_test.go
View file

@ -141,11 +141,7 @@ func TestServerRegisterPeer(t *testing.T) {
ps[i].netaddr.Port = i + 1 ps[i].netaddr.Port = i + 1
} }
ch := startWithChannel(s) startWithCleanup(t, s)
t.Cleanup(func() {
s.Shutdown()
<-ch
})
s.register <- ps[0] s.register <- ps[0]
require.Eventually(t, func() bool { return 1 == s.PeerCount() }, time.Second, time.Millisecond*10) require.Eventually(t, func() bool { return 1 == s.PeerCount() }, time.Second, time.Millisecond*10)
@ -395,12 +391,16 @@ func startTestServer(t *testing.T, protocolCfg ...func(*config.ProtocolConfigura
} else { } else {
s = newTestServer(t, srvCfg) s = newTestServer(t, srvCfg)
} }
startWithCleanup(t, s)
return s
}
func startWithCleanup(t *testing.T, s *Server) {
ch := startWithChannel(s) ch := startWithChannel(s)
t.Cleanup(func() { t.Cleanup(func() {
s.Shutdown() s.Shutdown()
<-ch <-ch
}) })
return s
} }
func TestBlock(t *testing.T) { func TestBlock(t *testing.T) {
@ -826,8 +826,8 @@ func TestHandleMPTData(t *testing.T) {
}) })
t.Run("good", func(t *testing.T) { t.Run("good", func(t *testing.T) {
s := startTestServer(t)
expected := [][]byte{{1, 2, 3}, {2, 3, 4}} expected := [][]byte{{1, 2, 3}, {2, 3, 4}}
s := newTestServer(t, ServerConfig{Port: 0, UserAgent: "/test/"})
s.chain.(*fakechain.FakeChain).P2PStateExchangeExtensions = true s.chain.(*fakechain.FakeChain).P2PStateExchangeExtensions = true
s.stateSync = &fakechain.FakeStateSync{ s.stateSync = &fakechain.FakeStateSync{
AddMPTNodesFunc: func(nodes [][]byte) error { AddMPTNodesFunc: func(nodes [][]byte) error {
@ -835,6 +835,7 @@ func TestHandleMPTData(t *testing.T) {
return nil return nil
}, },
} }
startWithCleanup(t, s)
p := newLocalPeer(t, s) p := newLocalPeer(t, s)
p.handshaked = true p.handshaked = true

1
pkg/rpc/server/server_helper_test.go
View file

@ -101,6 +101,7 @@ func initClearServerWithServices(t testing.TB, needOracle bool, needNotary bool)
chain, orc, cfg, logger := getUnitTestChain(t, needOracle, needNotary) chain, orc, cfg, logger := getUnitTestChain(t, needOracle, needNotary)
serverConfig := network.NewServerConfig(cfg) serverConfig := network.NewServerConfig(cfg)
serverConfig.Port = 0
server, err := network.NewServer(serverConfig, chain, logger) server, err := network.NewServer(serverConfig, chain, logger)
require.NoError(t, err) require.NoError(t, err)
rpcServer := New(chain, cfg.ApplicationConfiguration.RPC, server, orc, logger) rpcServer := New(chain, cfg.ApplicationConfiguration.RPC, server, orc, logger)