Repository: mesos Updated Branches: refs/heads/master eb901173b -> 634c8af26
Updated tests to use `createCallSubscribe`. Update all the tests that send v1 API SUBSCRIBE calls to use the `createCallSubscribe` test helper. Review: https://reviews.apache.org/r/63661/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/634c8af2 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/634c8af2 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/634c8af2 Branch: refs/heads/master Commit: 634c8af2618c57a1405d20717fa909b399486f37 Parents: eb90117 Author: Armand Grillet <agril...@mesosphere.io> Authored: Thu Jan 18 13:37:16 2018 +0100 Committer: Alexander Rukletsov <al...@apache.org> Committed: Thu Jan 18 13:37:16 2018 +0100 ---------------------------------------------------------------------- src/tests/api_tests.cpp | 59 +++++----------------------- src/tests/mesos.hpp | 17 ++++++++ src/tests/slave_authorization_tests.cpp | 18 +-------- src/tests/slave_recovery_tests.cpp | 9 +---- src/tests/slave_tests.cpp | 9 +---- 5 files changed, 30 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/634c8af2/src/tests/api_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/api_tests.cpp b/src/tests/api_tests.cpp index 5d8e32f..bdacc30 100644 --- a/src/tests/api_tests.cpp +++ b/src/tests/api_tests.cpp @@ -2101,15 +2101,7 @@ TEST_P(MasterAPITest, Subscribe) EXPECT_CALL(*scheduler, offers(_, _)) .WillOnce(FutureArg<1>(&offers)); - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(v1::DEFAULT_FRAMEWORK_INFO); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(v1::DEFAULT_FRAMEWORK_INFO)); AWAIT_READY(subscribed); @@ -2352,17 +2344,9 @@ TEST_P(MasterAPITest, EventAuthorizationFiltering) .WillOnce(FutureArg<1>(&offers1)) .WillRepeatedly(Return()); // Ignore subsequent offers. - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - - v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; - frameworkInfo.set_user("root"); - call.mutable_subscribe()->mutable_framework_info() - ->CopyFrom(frameworkInfo); - - mesos.send(call); - } + v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; + frameworkInfo.set_user("root"); + mesos.send(v1::createCallSubscribe(frameworkInfo)); AWAIT_READY(subscribed); @@ -2663,15 +2647,7 @@ TEST_P(MasterAPITest, FrameworksEvent) // when it reconnects. frameworkInfo.set_failover_timeout(Weeks(2).secs()); - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(frameworkInfo); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(frameworkInfo)); AWAIT_READY(subscribed); @@ -2711,16 +2687,7 @@ TEST_P(MasterAPITest, FrameworksEvent) // The scheduler should be able to immediately reconnect with the master. AWAIT_READY(connected); - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - call.mutable_framework_id()->CopyFrom(frameworkId); - - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(frameworkInfo); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(frameworkInfo, frameworkId)); event = decoder.read(); AWAIT_READY(event); @@ -3442,17 +3409,9 @@ TEST_P(MasterAPITest, Teardown) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; - frameworkInfo.set_user("root"); - subscribe->mutable_framework_info()->CopyFrom(frameworkInfo); - - mesos.send(call); - } + v1::FrameworkInfo frameworkInfo = v1::DEFAULT_FRAMEWORK_INFO; + frameworkInfo.set_user("root"); + mesos.send(v1::createCallSubscribe(frameworkInfo)); AWAIT_READY(subscribed); http://git-wip-us.apache.org/repos/asf/mesos/blob/634c8af2/src/tests/mesos.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.hpp b/src/tests/mesos.hpp index 8a2be90..a35c68e 100644 --- a/src/tests/mesos.hpp +++ b/src/tests/mesos.hpp @@ -2135,6 +2135,23 @@ inline mesos::v1::scheduler::Call createCallKill( return call; } + +inline mesos::v1::scheduler::Call createCallSubscribe( + const mesos::v1::FrameworkInfo& frameworkInfo, + const Option<mesos::v1::FrameworkID>& frameworkId = None()) +{ + mesos::v1::scheduler::Call call; + call.set_type(mesos::v1::scheduler::Call::SUBSCRIBE); + + call.mutable_subscribe()->mutable_framework_info()->CopyFrom(frameworkInfo); + + if (frameworkId.isSome()) { + call.mutable_framework_id()->CopyFrom(frameworkId.get()); + } + + return call; +} + } // namespace v1 { http://git-wip-us.apache.org/repos/asf/mesos/blob/634c8af2/src/tests/slave_authorization_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_authorization_tests.cpp b/src/tests/slave_authorization_tests.cpp index f3848db..2b3bbbc 100644 --- a/src/tests/slave_authorization_tests.cpp +++ b/src/tests/slave_authorization_tests.cpp @@ -838,14 +838,7 @@ TEST_F(ExecutorAuthorizationTest, FailedSubscribe) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(v1::DEFAULT_FRAMEWORK_INFO); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(v1::DEFAULT_FRAMEWORK_INFO)); AWAIT_READY(subscribed); v1::FrameworkID frameworkId(subscribed->framework_id()); @@ -994,14 +987,7 @@ TEST_F(ExecutorAuthorizationTest, FailedApiCalls) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(v1::DEFAULT_FRAMEWORK_INFO); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(v1::DEFAULT_FRAMEWORK_INFO)); AWAIT_READY(frameworkSubscribed); v1::FrameworkID frameworkId(frameworkSubscribed->framework_id()); http://git-wip-us.apache.org/repos/asf/mesos/blob/634c8af2/src/tests/slave_recovery_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_recovery_tests.cpp b/src/tests/slave_recovery_tests.cpp index 641fc6e..6d8a571 100644 --- a/src/tests/slave_recovery_tests.cpp +++ b/src/tests/slave_recovery_tests.cpp @@ -591,14 +591,7 @@ TYPED_TEST(SlaveRecoveryTest, DISABLED_ROOT_CGROUPS_ReconnectDefaultExecutor) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(evolve(frameworkInfo)); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(evolve(frameworkInfo))); AWAIT_READY(subscribed); http://git-wip-us.apache.org/repos/asf/mesos/blob/634c8af2/src/tests/slave_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/slave_tests.cpp b/src/tests/slave_tests.cpp index df02b46..3a6546b 100644 --- a/src/tests/slave_tests.cpp +++ b/src/tests/slave_tests.cpp @@ -2125,14 +2125,7 @@ TEST_F(SlaveTest, HTTPExecutorBadAuthentication) EXPECT_CALL(*scheduler, heartbeat(_)) .WillRepeatedly(Return()); // Ignore heartbeats. - { - v1::scheduler::Call call; - call.set_type(v1::scheduler::Call::SUBSCRIBE); - v1::scheduler::Call::Subscribe* subscribe = call.mutable_subscribe(); - subscribe->mutable_framework_info()->CopyFrom(v1::DEFAULT_FRAMEWORK_INFO); - - mesos.send(call); - } + mesos.send(v1::createCallSubscribe(v1::DEFAULT_FRAMEWORK_INFO)); AWAIT_READY(subscribed); v1::FrameworkID frameworkId(subscribed->framework_id());
