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 2013/05/26 18:57:38 UTC
[13/28] git commit: Cleaned up the output from running and
automagically disabling the CgroupsNoHierarchyTest.
Cleaned up the output from running and automagically disabling the
CgroupsNoHierarchyTest.
Review: https://reviews.apache.org/r/11274
Project: http://git-wip-us.apache.org/repos/asf/incubator-mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mesos/commit/7995751b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mesos/tree/7995751b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mesos/diff/7995751b
Branch: refs/heads/master
Commit: 7995751b66c7c09e31dcdc8b9444777718b4b2c4
Parents: 6b1b820
Author: Benjamin Hindman <be...@twitter.com>
Authored: Thu May 9 23:34:48 2013 -0700
Committer: Benjamin Hindman <be...@twitter.com>
Committed: Sun May 26 00:13:40 2013 -0700
----------------------------------------------------------------------
src/tests/cgroups_tests.cpp | 19 ++++++++-----------
src/tests/environment.cpp | 7 ++++---
2 files changed, 12 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/7995751b/src/tests/cgroups_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cgroups_tests.cpp b/src/tests/cgroups_tests.cpp
index f062fe6..f6b23c4 100644
--- a/src/tests/cgroups_tests.cpp
+++ b/src/tests/cgroups_tests.cpp
@@ -84,17 +84,14 @@ public:
Try<std::set<std::string> > hierarchies = cgroups::hierarchies();
ASSERT_SOME(hierarchies);
- if (!hierarchies.get().empty()) {
- std::cerr
- << "-------------------------------------------------------------\n"
- << "We cannot run any cgroups tests that require mounting\n"
- << "hierarchies because you have the following hierarchies mounted:\n"
- << strings::trim(stringify(hierarchies.get()), " {},") << "\n"
- << "You can either unmount those hierarchies, or disable\n"
- << "this test case (i.e., --gtest_filter=-CgroupsNoHierarchyTest.*).\n"
- << "-------------------------------------------------------------"
- << std::endl;
- }
+ ASSERT_TRUE(hierarchies.get().empty())
+ << "-------------------------------------------------------------\n"
+ << "We cannot run any cgroups tests that require mounting\n"
+ << "hierarchies because you have the following hierarchies mounted:\n"
+ << strings::trim(stringify(hierarchies.get()), " {},") << "\n"
+ << "You can either unmount those hierarchies, or disable\n"
+ << "this test case (i.e., --gtest_filter=-CgroupsNoHierarchyTest.*).\n"
+ << "-------------------------------------------------------------";
}
};
http://git-wip-us.apache.org/repos/asf/incubator-mesos/blob/7995751b/src/tests/environment.cpp
----------------------------------------------------------------------
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 2a22acd..d8bb5fd 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -35,6 +35,8 @@
#include "linux/cgroups.hpp"
#endif
+#include "logging/logging.hpp"
+
#include "tests/environment.hpp"
#include "tests/flags.hpp"
@@ -83,15 +85,14 @@ static bool enable(const ::testing::TestInfo& test)
#ifdef __linux__
if (strings::contains(name, "NOHIERARCHY_")) {
Try<std::set<std::string> > hierarchies = cgroups::hierarchies();
- CHECK(hierarchies.isSome());
+ CHECK_SOME(hierarchies);
if (!hierarchies.get().empty()) {
std::cerr
<< "-------------------------------------------------------------\n"
<< "We cannot run any cgroups tests that require mounting\n"
<< "hierarchies because you have the following hierarchies mounted:\n"
<< strings::trim(stringify(hierarchies.get()), " {},") << "\n"
- << "You can either unmount those hierarchies, or disable\n"
- << "this test case (i.e., --gtest_filter=-CgroupsNoHierarchyTest.*).\n"
+ << "We'll disable the CgroupsNoHierarchyTest test fixture for now.\n"
<< "-------------------------------------------------------------"
<< std::endl;