Skip to content

test: fixing interactions between waitFor and ignore_spurious_events #4309

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
htuch merged 2 commits into from
Sep 4, 2018
Merged

test: fixing interactions between waitFor and ignore_spurious_events #4309

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae34714
test: fixing interactions between waitFor and ignore_spurious_events
alyssawilk Aug 30, 2018
93c3991
changing the fix for waitForHalfClose
alyssawilk Sep 4, 2018
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
4 changes: 2 additions & 2 deletions test/integration/fake_upstream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,13 +276,13 @@ AssertionResult FakeConnectionBase::waitForHalfClose(bool ignore_spurious_events
if (std::chrono::steady_clock::now() >= end_time) {
return AssertionFailure() << "Timed out waiting for half close.";
}
connection_event_.waitFor(lock_, 5ms); // Safe since CondVar::waitFor won't throw.
Thread::CondVar::WaitStatus status = connection_event_.waitFor(lock_, 5ms);
// The default behavior of waitForHalfClose is to assume the test cleanly
// calls waitForData, waitForNewStream, etc. to handle all events on the
// connection. If the caller explicitly notes that other events should be
// ignored, continue looping until a disconnect is detected. Otherwise fall
// through and hit the assert below.
if (!ignore_spurious_events) {
if (status == Thread::CondVar::WaitStatus::NoTimeout && !ignore_spurious_events) {
break;
}
}
Expand Down