Skip to content

Fix flaky tests #287

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
rvagg merged 2 commits into from
Nov 30, 2021
Merged

Fix flaky tests #287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6587f43
fix(responsemanager): fix flaky tests
hannahhoward Nov 30, 2021
4bcafb9
fix(responsemanager): make fix more global
hannahhoward Nov 30, 2021
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
7 changes: 6 additions & 1 deletion responsemanager/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,12 @@ func (rm *ResponseManager) GetUpdates(p peer.ID, requestID graphsync.RequestID,

// FinishTask marks a task from the task queue as done
func (rm *ResponseManager) FinishTask(task *peertask.Task, err error) {
rm.send(&finishTaskRequest{task, err}, nil)
done := make(chan struct{}, 1)
rm.send(&finishTaskRequest{task, err, done}, nil)
select {
case <-rm.ctx.Done():
case <-done:
}
}

// CloseWithNetworkError closes a request due to a network error
Expand Down
5 changes: 5 additions & 0 deletions responsemanager/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,15 @@ func (rur *responseUpdateRequest) handle(rm *ResponseManager) {
type finishTaskRequest struct {
task *peertask.Task
err error
done chan struct{}
}

func (ftr *finishTaskRequest) handle(rm *ResponseManager) {
rm.finishTask(ftr.task, ftr.err)
select {
case <-rm.ctx.Done():
case ftr.done <- struct{}{}:
}
}

type startTaskRequest struct {
Expand Down
2 changes: 2 additions & 0 deletions responsemanager/responsemanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,6 +1111,7 @@ func (td *testData) newQueryExecutor(manager queryexecutor.Manager) *queryexecut
func (td *testData) assertPausedRequest() {
var pausedRequest pausedRequest
testutil.AssertReceive(td.ctx, td.t, td.pausedRequests, &pausedRequest, "should pause request")
td.taskqueue.WaitForNoActiveTasks()
}

func (td *testData) getAllBlocks() []blocks.Block {
Expand Down Expand Up @@ -1147,6 +1148,7 @@ func (td *testData) assertCompleteRequestWith(expectedCode graphsync.ResponseSta
var status graphsync.ResponseStatusCode
testutil.AssertReceive(td.ctx, td.t, td.completedResponseStatuses, &status, "should receive status")
require.Equal(td.t, expectedCode, status)
td.taskqueue.WaitForNoActiveTasks()
}

func (td *testData) assertOnlyCompleteProcessingWith(expectedCode graphsync.ResponseStatusCode) {
Expand Down