You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2015/04/21 21:56:35 UTC
[9/9] mesos git commit: Wired up test allocator to allocator tests.
Wired up test allocator to allocator tests.
Same typed tests are used for built-in and modularized allocators.
Review: https://reviews.apache.org/r/31268
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/da607079
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/da607079
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/da607079
Branch: refs/heads/master
Commit: da607079b473d34d06031943e69cd8e0c24073c5
Parents: 54b5bdc
Author: Alexander Rukletsov <ru...@gmail.com>
Authored: Tue Apr 21 12:12:12 2015 -0700
Committer: Niklas Q. Nielsen <ni...@qni.dk>
Committed: Tue Apr 21 12:12:12 2015 -0700
----------------------------------------------------------------------
src/tests/master_allocator_tests.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/da607079/src/tests/master_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/master_allocator_tests.cpp b/src/tests/master_allocator_tests.cpp
index 8d1a866..534b248 100644
--- a/src/tests/master_allocator_tests.cpp
+++ b/src/tests/master_allocator_tests.cpp
@@ -27,6 +27,8 @@
#include <mesos/master/allocator.hpp>
+#include <mesos/module/allocator.hpp>
+
#include <process/clock.hpp>
#include <process/future.hpp>
#include <process/gmock.hpp>
@@ -43,6 +45,7 @@
#include "tests/containerizer.hpp"
#include "tests/mesos.hpp"
+#include "tests/module.hpp"
using mesos::master::allocator::Allocator;
using mesos::internal::master::allocator::HierarchicalDRFAllocator;
@@ -74,7 +77,9 @@ namespace tests {
template <typename T>
class MasterAllocatorTest : public MesosTest {};
-typedef ::testing::Types<HierarchicalDRFAllocator> AllocatorTypes;
+typedef ::testing::Types<HierarchicalDRFAllocator,
+ tests::Module<Allocator, TestDRFAllocator>>
+ AllocatorTypes;
// Causes all TYPED_TEST(MasterAllocatorTest, ...) to be run for