You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/10/27 02:12:51 UTC
git commit: Fixed GroupTest.MultipleGroups test.
Updated Branches:
refs/heads/master d8afb0c8b -> 52232158a
Fixed GroupTest.MultipleGroups test.
Review: https://reviews.apache.org/r/14961
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/52232158
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/52232158
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/52232158
Branch: refs/heads/master
Commit: 52232158ad5c522e8f8a51afb1def0a387808506
Parents: d8afb0c
Author: Vinod Kone <vi...@twitter.com>
Authored: Fri Oct 25 17:23:16 2013 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Sat Oct 26 18:12:07 2013 -0700
----------------------------------------------------------------------
src/tests/group_tests.cpp | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/52232158/src/tests/group_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/group_tests.cpp b/src/tests/group_tests.cpp
index c7f789c..fb4c2f1 100644
--- a/src/tests/group_tests.cpp
+++ b/src/tests/group_tests.cpp
@@ -209,6 +209,15 @@ TEST_F(GroupTest, MultipleGroups)
Future<std::set<Group::Membership> > memberships1 = group1.watch();
AWAIT_READY(memberships1);
+
+ // NOTE: Since 'group2' joining doesn't guarantee that 'group1'
+ // knows about it synchronously, we have to ensure that 'group1'
+ // knows about both the memberships.
+ if (memberships1.get().size() == 1) {
+ memberships1 = group1.watch(memberships1.get());
+ AWAIT_READY(memberships1);
+ }
+
EXPECT_EQ(2u, memberships1.get().size());
EXPECT_EQ(1u, memberships1.get().count(membership1.get()));
EXPECT_EQ(1u, memberships1.get().count(membership2.get()));
@@ -216,6 +225,13 @@ TEST_F(GroupTest, MultipleGroups)
Future<std::set<Group::Membership> > memberships2 = group2.watch();
AWAIT_READY(memberships2);
+
+ // See comments above for why we need to do this.
+ if (memberships2.get().size() == 1) {
+ memberships2 = group2.watch(memberships2.get());
+ AWAIT_READY(memberships2);
+ }
+
EXPECT_EQ(2u, memberships2.get().size());
EXPECT_EQ(1u, memberships2.get().count(membership1.get()));
EXPECT_EQ(1u, memberships2.get().count(membership2.get()));