You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/23 23:26:57 UTC
mesos git commit: Fixed a few variable names in tests.
Repository: mesos
Updated Branches:
refs/heads/master 044196ff6 -> e40318975
Fixed a few variable names in tests.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e4031897
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e4031897
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e4031897
Branch: refs/heads/master
Commit: e40318975f63ddea6ac1d59afa17d8f4fe61ae1e
Parents: 044196f
Author: Neil Conway <ne...@gmail.com>
Authored: Tue May 23 14:32:26 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Tue May 23 16:17:34 2017 -0700
----------------------------------------------------------------------
src/tests/master_allocator_tests.cpp | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e4031897/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index d05ee44..49d87af 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -218,16 +218,16 @@ TYPED_TEST(MasterAllocatorTest, ResourcesUnused)
MockExecutor exec(DEFAULT_EXECUTOR_ID);
TestContainerizer containerizer(&exec);
- slave::Flags flags1 = this->CreateSlaveFlags();
- flags1.resources = Some("cpus:2;mem:1024");
+ slave::Flags slaveFlags = this->CreateSlaveFlags();
+ slaveFlags.resources = Some("cpus:2;mem:1024");
EXPECT_CALL(allocator, addSlave(_, _, _, _, _, _));
Owned<MasterDetector> detector = master.get()->createDetector();
- Try<Owned<cluster::Slave>> slave1 =
- this->StartSlave(detector.get(), &containerizer, flags1);
- ASSERT_SOME(slave1);
+ Try<Owned<cluster::Slave>> slave =
+ this->StartSlave(detector.get(), &containerizer, slaveFlags);
+ ASSERT_SOME(slave);
MockScheduler sched1;
MesosSchedulerDriver driver1(
@@ -322,15 +322,16 @@ TYPED_TEST(MasterAllocatorTest, OutOfOrderDispatch)
Try<Owned<cluster::Master>> master = this->StartMaster(&allocator);
ASSERT_SOME(master);
- slave::Flags flags1 = this->CreateSlaveFlags();
- flags1.resources = Some("cpus:2;mem:1024");
+ slave::Flags slaveFlags = this->CreateSlaveFlags();
+ slaveFlags.resources = Some("cpus:2;mem:1024");
EXPECT_CALL(allocator, addSlave(_, _, _, _, _, _));
Owned<MasterDetector> detector = master.get()->createDetector();
- Try<Owned<cluster::Slave>> slave1 = this->StartSlave(detector.get(), flags1);
- ASSERT_SOME(slave1);
+ Try<Owned<cluster::Slave>> slave =
+ this->StartSlave(detector.get(), slaveFlags);
+ ASSERT_SOME(slave);
FrameworkInfo frameworkInfo1 = DEFAULT_FRAMEWORK_INFO;
frameworkInfo1.set_user("user1");
@@ -487,7 +488,7 @@ TYPED_TEST(MasterAllocatorTest, SchedulerFailover)
EXPECT_CALL(sched1, resourceOffers(_, _))
.WillRepeatedly(DeclineOffers()); // For subsequent offers.
- // Initially, all of slave1's resources are available.
+ // Initially, all of the slave's resources are available.
EXPECT_CALL(sched1, resourceOffers(_, OfferEq(3, 1024)))
.WillOnce(LaunchTasks(DEFAULT_EXECUTOR_INFO, 1, 1, 256, "*"));