You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2014/11/20 23:10:41 UTC
[2/2] mesos git commit: Fixed future dispatch in tests to match
function type.
Fixed future dispatch in tests to match function type.
Review: https://reviews.apache.org/r/28081
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2eaa7d36
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2eaa7d36
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2eaa7d36
Branch: refs/heads/master
Commit: 2eaa7d3611cf8202a89617541ab0a144242abfa3
Parents: b977eae
Author: Timothy Chen <tn...@apache.org>
Authored: Fri Nov 14 17:54:42 2014 -0800
Committer: Timothy Chen <tn...@apache.org>
Committed: Thu Nov 20 14:12:40 2014 -0800
----------------------------------------------------------------------
src/tests/allocator_tests.cpp | 5 +++--
src/tests/master_tests.cpp | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2eaa7d36/src/tests/allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/allocator_tests.cpp b/src/tests/allocator_tests.cpp
index 58e15aa..1fcbb4a 100644
--- a/src/tests/allocator_tests.cpp
+++ b/src/tests/allocator_tests.cpp
@@ -45,6 +45,7 @@ using namespace mesos::internal;
using namespace mesos::internal::tests;
using mesos::internal::master::allocator::Allocator;
+using mesos::internal::master::allocator::AllocatorProcess;
using mesos::internal::master::allocator::HierarchicalDRFAllocatorProcess;
using mesos::internal::master::Master;
@@ -754,7 +755,7 @@ TEST_F(ReservationAllocatorTest, ResourcesReturned)
.Times(2);
Future<Nothing> slaveAdded1 = FUTURE_DISPATCH(
- allocator.real, &HierarchicalDRFAllocatorProcess::slaveAdded);
+ allocator.real, &AllocatorProcess::slaveAdded);
slave::Flags flags1 = CreateSlaveFlags();
flags1.resources = Some("cpus(role1):1;mem(role1):200;cpus(role2):2;"
@@ -766,7 +767,7 @@ TEST_F(ReservationAllocatorTest, ResourcesReturned)
AWAIT_READY(slaveAdded1);
Future<Nothing> slaveAdded2 = FUTURE_DISPATCH(
- allocator.real, &HierarchicalDRFAllocatorProcess::slaveAdded);
+ allocator.real, &AllocatorProcess::slaveAdded);
// This slave's resources will never be offered to anyone,
// because there is no framework with role3.
http://git-wip-us.apache.org/repos/asf/mesos/blob/2eaa7d36/src/tests/master_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_tests.cpp b/src/tests/master_tests.cpp
index 0ed02b3..065fc3e 100644
--- a/src/tests/master_tests.cpp
+++ b/src/tests/master_tests.cpp
@@ -2467,7 +2467,7 @@ TEST_F(MasterTest, ReleaseResourcesForTerminalTaskWithPendingUpdates)
AWAIT_READY(__statusUpdate2);
Future<Nothing> resourcesRecovered = FUTURE_DISPATCH(
- _, &HierarchicalDRFAllocatorProcess::resourcesRecovered);
+ _, &AllocatorProcess::resourcesRecovered);
// Advance the clock so that the status update manager resends
// TASK_RUNNING update with 'latest_state' as TASK_FINISHED.