Disabled authentication from scheduler library tests. Review: https://reviews.apache.org/r/37301
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6c4fa12f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6c4fa12f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6c4fa12f Branch: refs/heads/master Commit: 6c4fa12f02903f568a0475c6ed472c34c9f598cb Parents: 5c8c46a Author: Anand Mazumdar <[email protected]> Authored: Mon Aug 10 21:02:05 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Aug 10 21:02:05 2015 -0700 ---------------------------------------------------------------------- src/tests/scheduler_tests.cpp | 60 +++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6c4fa12f/src/tests/scheduler_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/scheduler_tests.cpp b/src/tests/scheduler_tests.cpp index 3f01c06..837d9e8 100644 --- a/src/tests/scheduler_tests.cpp +++ b/src/tests/scheduler_tests.cpp @@ -107,7 +107,10 @@ ACTION_P(Enqueue, queue) // SUBSCRIBED event with the previously assigned framework id. TEST_F(SchedulerTest, Subscribe) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); Callbacks callbacks; @@ -118,7 +121,6 @@ TEST_F(SchedulerTest, Subscribe) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -172,7 +174,10 @@ TEST_F(SchedulerTest, Subscribe) TEST_F(SchedulerTest, TaskRunning) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -190,7 +195,6 @@ TEST_F(SchedulerTest, TaskRunning) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -280,7 +284,10 @@ TEST_F(SchedulerTest, TaskRunning) TEST_F(SchedulerTest, ReconcileTask) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -298,7 +305,6 @@ TEST_F(SchedulerTest, ReconcileTask) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -390,7 +396,10 @@ TEST_F(SchedulerTest, ReconcileTask) TEST_F(SchedulerTest, KillTask) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -408,7 +417,6 @@ TEST_F(SchedulerTest, KillTask) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -515,7 +523,10 @@ TEST_F(SchedulerTest, KillTask) TEST_F(SchedulerTest, ShutdownExecutor) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -533,7 +544,6 @@ TEST_F(SchedulerTest, ShutdownExecutor) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -629,7 +639,10 @@ TEST_F(SchedulerTest, ShutdownExecutor) TEST_F(SchedulerTest, Teardown) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -647,7 +660,6 @@ TEST_F(SchedulerTest, Teardown) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -731,7 +743,10 @@ TEST_F(SchedulerTest, Teardown) TEST_F(SchedulerTest, Decline) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); Try<PID<Slave>> slave = StartSlave(); @@ -745,7 +760,6 @@ TEST_F(SchedulerTest, Decline) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -809,7 +823,10 @@ TEST_F(SchedulerTest, Decline) TEST_F(SchedulerTest, Revive) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); Try<PID<Slave>> slave = StartSlave(); @@ -823,7 +840,6 @@ TEST_F(SchedulerTest, Revive) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -903,7 +919,10 @@ TEST_F(SchedulerTest, Revive) TEST_F(SchedulerTest, Message) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); MockExecutor exec(DEFAULT_EXECUTOR_ID); @@ -921,7 +940,6 @@ TEST_F(SchedulerTest, Message) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1)); @@ -1010,7 +1028,10 @@ TEST_F(SchedulerTest, Message) TEST_F(SchedulerTest, Request) { - Try<PID<Master>> master = StartMaster(); + master::Flags flags = CreateMasterFlags(); + flags.authenticate_frameworks = false; + + Try<PID<Master>> master = StartMaster(flags); ASSERT_SOME(master); Callbacks callbacks; @@ -1021,7 +1042,6 @@ TEST_F(SchedulerTest, Request) Mesos mesos( master.get(), - DEFAULT_V1_CREDENTIAL, lambda::bind(&Callbacks::connected, lambda::ref(callbacks)), lambda::bind(&Callbacks::disconnected, lambda::ref(callbacks)), lambda::bind(&Callbacks::received, lambda::ref(callbacks), lambda::_1));
