Repository: mesos Updated Branches: refs/heads/master 584301f99 -> 7c26c44d9
Fixed the flaky HttpApiTest.UpdatePidToHttpSchedulerWithoutForce test. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7c26c44d Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7c26c44d Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7c26c44d Branch: refs/heads/master Commit: 7c26c44d93fafebc034206f15d277d0d7958b35b Parents: 584301f Author: Benjamin Mahler <[email protected]> Authored: Mon Aug 17 17:15:31 2015 -0700 Committer: Benjamin Mahler <[email protected]> Committed: Mon Aug 17 17:15:31 2015 -0700 ---------------------------------------------------------------------- src/tests/http_api_tests.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/7c26c44d/src/tests/http_api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/http_api_tests.cpp b/src/tests/http_api_tests.cpp index 66a00a3..7938bbb 100644 --- a/src/tests/http_api_tests.cpp +++ b/src/tests/http_api_tests.cpp @@ -594,8 +594,10 @@ TEST_P(HttpApiTest, UpdatePidToHttpSchedulerWithoutForce) Clock::advance(DEFAULT_HEARTBEAT_INTERVAL); Clock::settle(); + // The next read should be EOF. event = responseDecoder.read(); - ASSERT_TRUE(event.isPending()); + AWAIT_READY(event); + EXPECT_NONE(event.get()); driver.stop(); driver.join();
