Skip to content

testing: fix TestStartAndStop #2757

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
tsachiherman merged 1 commit into from
Aug 23, 2021
Merged

testing: fix TestStartAndStop #2757

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
22 changes: 17 additions & 5 deletions rpcs/txSyncer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,15 +276,22 @@ func TestNoClientsSync(t *testing.T) {
func TestStartAndStop(t *testing.T) {
partitiontest.PartitionTest(t)

t.Skip("TODO: replace this test in new client paradigm")
pool := makeMockPendingTxAggregate(3)
pool := makeMockPendingTxAggregate(1)
nodeA := basicRPCNode{}
txservice := makeTxService(pool, "test genesisID", config.GetDefaultLocal().TxPoolSize, config.GetDefaultLocal().TxSyncServeResponseSize)
nodeA.RegisterHTTPHandler(TxServiceHTTPPath, txservice)
nodeA.start()
nodeAURL := nodeA.rootURL()

runner := mockRunner{failWithNil: false, failWithError: false, txgroups: pool.PendingTxGroups()[len(pool.PendingTxGroups())-1:], done: make(chan *rpc.Call)}
client := mockRPCClient{client: &runner, log: logging.TestingLog(t)}
client := mockRPCClient{client: &runner, rootURL: nodeAURL, log: logging.TestingLog(t)}
clientAgg := mockClientAggregator{peers: []network.Peer{&client}}
handler := mockHandler{}

syncerPool := makeMockPendingTxAggregate(0)
syncInterval := time.Second
syncTimeout := time.Second
syncer := MakeTxSyncer(pool, &clientAgg, &handler, syncInterval, syncTimeout, config.GetDefaultLocal().TxSyncServeResponseSize)
syncer := MakeTxSyncer(syncerPool, &clientAgg, &handler, syncInterval, syncTimeout, config.GetDefaultLocal().TxSyncServeResponseSize)
syncer.log = logging.TestingLog(t)

// ensure that syncing doesn't start
Expand All @@ -295,7 +302,12 @@ func TestStartAndStop(t *testing.T) {

// signal that syncing can start
close(canStart)
time.Sleep(2 * time.Second)
for x := 0; x < 20; x++ {
time.Sleep(100 * time.Millisecond)
if atomic.LoadInt32(&handler.messageCounter) != 0 {
break
}
}
require.Equal(t, int32(1), atomic.LoadInt32(&handler.messageCounter))

// stop syncing and ensure it doesn't happen
Expand Down