Repository: mesos Updated Branches: refs/heads/master d41f19e7b -> c0e1b41f8
Stopped awaiting the connected event in ports isolator tests. Rather than explicitly waiting for the `connected` scheduler event, consistently apply the testing pattern from the default executor tests. We expect that the `connected` event happens, but we only need to synchronize the test on the `subscribed` event. Review: https://reviews.apache.org/r/63183/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c0e1b41f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c0e1b41f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c0e1b41f Branch: refs/heads/master Commit: c0e1b41f82d764fe240de721c30314da2b62445a Parents: d41f19e Author: James Peach <jpe...@apache.org> Authored: Mon Oct 30 12:44:55 2017 +0100 Committer: Alexander Rukletsov <al...@apache.org> Committed: Mon Oct 30 12:44:55 2017 +0100 ---------------------------------------------------------------------- .../containerizer/ports_isolator_tests.cpp | 53 +++++++------------- 1 file changed, 18 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c0e1b41f/src/tests/containerizer/ports_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/ports_isolator_tests.cpp b/src/tests/containerizer/ports_isolator_tests.cpp index 7a19193..0429003 100644 --- a/src/tests/containerizer/ports_isolator_tests.cpp +++ b/src/tests/containerizer/ports_isolator_tests.cpp @@ -1115,19 +1115,8 @@ TEST_F(NetworkPortsIsolatorTest, ROOT_NC_TaskGroup) auto scheduler = std::make_shared<v1::MockHTTPScheduler>(); - v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; - - Future<Nothing> connected; EXPECT_CALL(*scheduler, connected(_)) - .WillOnce(DoAll(v1::scheduler::SendSubscribe(frameworkInfo), - FutureSatisfy(&connected))); - - v1::scheduler::TestMesos mesos( - master.get()->pid, - ContentType::PROTOBUF, - scheduler); - - AWAIT_READY(connected); + .WillOnce(v1::scheduler::SendSubscribe(v1::DEFAULT_FRAMEWORK_INFO)); Future<v1::scheduler::Event::Subscribed> subscribed; EXPECT_CALL(*scheduler, subscribed(_, _)) @@ -1141,8 +1130,12 @@ TEST_F(NetworkPortsIsolatorTest, ROOT_NC_TaskGroup) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - AWAIT_READY(subscribed); + v1::scheduler::TestMesos mesos( + master.get()->pid, + ContentType::PROTOBUF, + scheduler); + AWAIT_READY(subscribed); v1::FrameworkID frameworkId(subscribed->framework_id()); v1::ExecutorInfo executorInfo = v1::createExecutorInfo( @@ -1284,17 +1277,8 @@ TEST_F(NetworkPortsIsolatorTest, ROOT_NC_RecoverNestedBadTask) v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); - Future<Nothing> connected; EXPECT_CALL(*scheduler, connected(_)) - .WillOnce(DoAll(v1::scheduler::SendSubscribe(frameworkInfo), - FutureSatisfy(&connected))); - - v1::scheduler::TestMesos mesos( - master.get()->pid, - ContentType::PROTOBUF, - scheduler); - - AWAIT_READY(connected); + .WillOnce(v1::scheduler::SendSubscribe(frameworkInfo)); Future<v1::scheduler::Event::Subscribed> subscribed; EXPECT_CALL(*scheduler, subscribed(_, _)) @@ -1308,8 +1292,12 @@ TEST_F(NetworkPortsIsolatorTest, ROOT_NC_RecoverNestedBadTask) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - AWAIT_READY(subscribed); + v1::scheduler::TestMesos mesos( + master.get()->pid, + ContentType::PROTOBUF, + scheduler); + AWAIT_READY(subscribed); v1::FrameworkID frameworkId(subscribed->framework_id()); v1::ExecutorInfo executorInfo = v1::createExecutorInfo( @@ -1474,17 +1462,8 @@ TEST_F(NetworkPortsIsolatorTest, ROOT_NC_RecoverNestedGoodTask) v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; frameworkInfo.set_checkpoint(true); - Future<Nothing> connected; EXPECT_CALL(*scheduler, connected(_)) - .WillOnce(DoAll(v1::scheduler::SendSubscribe(frameworkInfo), - FutureSatisfy(&connected))); - - v1::scheduler::TestMesos mesos( - master.get()->pid, - ContentType::PROTOBUF, - scheduler); - - AWAIT_READY(connected); + .WillOnce(v1::scheduler::SendSubscribe(frameworkInfo)); Future<v1::scheduler::Event::Subscribed> subscribed; EXPECT_CALL(*scheduler, subscribed(_, _)) @@ -1498,8 +1477,12 @@ TEST_F(NetworkPortsIsolatorTest, ROOT_NC_RecoverNestedGoodTask) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - AWAIT_READY(subscribed); + v1::scheduler::TestMesos mesos( + master.get()->pid, + ContentType::PROTOBUF, + scheduler); + AWAIT_READY(subscribed); v1::FrameworkID frameworkId(subscribed->framework_id()); v1::ExecutorInfo executorInfo = v1::createExecutorInfo(
