Repository: mesos Updated Branches: refs/heads/master 3cf8c2ff9 -> 623e46791
Mount all supported subsystems in the containerizer tests. Rather than a hard-coded list of subsystems, just mount everything we find that is supported. Review: https://reviews.apache.org/r/56733/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/623e4679 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/623e4679 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/623e4679 Branch: refs/heads/master Commit: 623e467913f1a91a965c0c37397bac583c9706c1 Parents: 3cf8c2f Author: James Peach <[email protected]> Authored: Tue Mar 7 11:15:12 2017 -0800 Committer: Jiang Yan Xu <[email protected]> Committed: Tue Mar 7 14:07:36 2017 -0800 ---------------------------------------------------------------------- src/tests/mesos.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/623e4679/src/tests/mesos.cpp ---------------------------------------------------------------------- diff --git a/src/tests/mesos.cpp b/src/tests/mesos.cpp index 6a96fa5..78f552e 100644 --- a/src/tests/mesos.cpp +++ b/src/tests/mesos.cpp @@ -646,11 +646,10 @@ void ContainerizerTest<slave::MesosContainerizer>::SetUp() { MesosTest::SetUp(); - subsystems.insert("cpu"); - subsystems.insert("cpuacct"); - subsystems.insert("memory"); - subsystems.insert("freezer"); - subsystems.insert("perf_event"); + Try<std::set<string>> supportedSubsystems = cgroups::subsystems(); + ASSERT_SOME(supportedSubsystems); + + subsystems = supportedSubsystems.get(); Result<string> user = os::user(); EXPECT_SOME(user);
