You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2017/11/20 00:54:20 UTC
[09/15] mesos git commit: Removed test dependency on internal
process::internal::discarded.
Removed test dependency on internal process::internal::discarded.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e636aa71
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e636aa71
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e636aa71
Branch: refs/heads/master
Commit: e636aa714c91f0dc0b7427da9b4862fbf64faf20
Parents: f663d32
Author: Benjamin Hindman <be...@gmail.com>
Authored: Wed Aug 2 20:25:26 2017 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Nov 19 16:33:47 2017 -0800
----------------------------------------------------------------------
3rdparty/libprocess/src/tests/collect_tests.cpp | 45 +++++++++++---------
1 file changed, 26 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/e636aa71/3rdparty/libprocess/src/tests/collect_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/collect_tests.cpp b/3rdparty/libprocess/src/tests/collect_tests.cpp
index 155e0bb..91760ec 100644
--- a/3rdparty/libprocess/src/tests/collect_tests.cpp
+++ b/3rdparty/libprocess/src/tests/collect_tests.cpp
@@ -111,20 +111,24 @@ TEST(CollectTest, Failure)
TEST(CollectTest, DiscardPropagation)
{
- Future<int> future1;
- Future<bool> future2;
+ Promise<int> promise1;
+ Promise<bool> promise2;
- future1
- .onDiscard([=](){ process::internal::discarded(future1); });
- future2
- .onDiscard([=](){ process::internal::discarded(future2); });
+ promise1.future()
+ .onDiscard([&](){ promise1.discard(); });
+ promise2.future()
+ .onDiscard([&](){ promise2.discard(); });
- Future<std::tuple<int, bool>> collect = process::collect(future1, future2);
+ Future<std::tuple<int, bool>> collect = process::collect(
+ promise1.future(),
+ promise2.future());
collect.discard();
- AWAIT_DISCARDED(future1);
- AWAIT_DISCARDED(future2);
+ AWAIT_DISCARDED(collect);
+
+ AWAIT_DISCARDED(promise1.future());
+ AWAIT_DISCARDED(promise2.future());
}
@@ -226,19 +230,22 @@ TEST(AwaitTest, Discarded)
TEST(AwaitTest, DiscardPropagation)
{
- Future<int> future1;
- Future<bool> future2;
+ Promise<int> promise1;
+ Promise<bool> promise2;
- future1
- .onDiscard([=](){ process::internal::discarded(future1); });
- future2
- .onDiscard([=](){ process::internal::discarded(future2); });
+ promise1.future()
+ .onDiscard([&](){ promise1.discard(); });
+ promise2.future()
+ .onDiscard([&](){ promise2.discard(); });
- Future<std::tuple<Future<int>, Future<bool>>> await =
- process::await(future1, future2);
+ Future<std::tuple<Future<int>, Future<bool>>> await = process::await(
+ promise1.future(),
+ promise2.future());
await.discard();
- AWAIT_DISCARDED(future1);
- AWAIT_DISCARDED(future2);
+ AWAIT_DISCARDED(await);
+
+ AWAIT_DISCARDED(promise1.future());
+ AWAIT_DISCARDED(promise2.future());
}