git commit: Fixed DRFAllocatorTest.SameShareAllocations test.

[vi...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 03284a323 -> 24602dfb7


Fixed DRFAllocatorTest.SameShareAllocations test.

Review: https://reviews.apache.org/r/22995


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/24602dfb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/24602dfb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/24602dfb

Branch: refs/heads/master
Commit: 24602dfb7ec3b7dafd5cb2d7a60508eb30b5829d
Parents: 03284a3
Author: Vinod Kone <vi...@gmail.com>
Authored: Wed Jun 25 18:39:09 2014 -0700
Committer: Vinod Kone <vi...@gmail.com>
Committed: Wed Jun 25 18:41:08 2014 -0700

----------------------------------------------------------------------
 src/tests/allocator_tests.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/24602dfb/src/tests/allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/allocator_tests.cpp b/src/tests/allocator_tests.cpp
index a968ea3..42cb345 100644
--- a/src/tests/allocator_tests.cpp
+++ b/src/tests/allocator_tests.cpp
@@ -368,7 +368,11 @@ TEST_F(DRFAllocatorTest, SameShareAllocations)
   MesosSchedulerDriver driver2(
       &sched2, frameworkInfo2, master.get(), DEFAULT_CREDENTIAL);
 
-  EXPECT_CALL(allocator, frameworkAdded(_, _, _));
+  // We need to retire this expectation on the first match because
+  // framework1 can match this expectation first in which case
+  // framework2 should be able to match the expectation above.
+  EXPECT_CALL(allocator, frameworkAdded(_, _, _))
+    .RetiresOnSaturation();
 
   Future<Nothing> registered2;
   EXPECT_CALL(sched2, registered(_, _, _))