You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2015/09/24 21:45:19 UTC
mesos git commit: Removed a CHECK that causes the test binary to
crash.
Repository: mesos
Updated Branches:
refs/heads/master 05b5081e2 -> ef78de1d9
Removed a CHECK that causes the test binary to crash.
Review: https://reviews.apache.org/r/38728
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ef78de1d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ef78de1d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ef78de1d
Branch: refs/heads/master
Commit: ef78de1d997bea744a10f4000bbcc5e857d473b0
Parents: 05b5081
Author: Paul Brett <pa...@twopensource.com>
Authored: Thu Sep 24 12:43:56 2015 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Sep 24 12:43:56 2015 -0700
----------------------------------------------------------------------
src/tests/environment.cpp | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ef78de1d/src/tests/environment.cpp
----------------------------------------------------------------------
diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp
index 3c586ec..000b201 100644
--- a/src/tests/environment.cpp
+++ b/src/tests/environment.cpp
@@ -129,8 +129,16 @@ public:
{
#ifdef __linux__
Try<set<string> > hierarchies_ = cgroups::hierarchies();
- CHECK_SOME(hierarchies_);
- if (!hierarchies_.get().empty()) {
+ if (hierarchies_.isError()) {
+ std::cerr
+ << "-------------------------------------------------------------\n"
+ << "We cannot run any cgroups tests that require mounting\n"
+ << "hierarchies because reading cgroup heirarchies failed:\n"
+ << hierarchies_.error() << "\n"
+ << "We'll disable the CgroupsNoHierarchyTest test fixture for now.\n"
+ << "-------------------------------------------------------------"
+ << std::endl;
+ } else if (!hierarchies_.get().empty()) {
std::cerr
<< "-------------------------------------------------------------\n"
<< "We cannot run any cgroups tests that require mounting\n"
@@ -139,9 +147,9 @@ public:
<< "We'll disable the CgroupsNoHierarchyTest test fixture for now.\n"
<< "-------------------------------------------------------------"
<< std::endl;
+ } else {
+ hierarchies = hierarchies_.get();
}
-
- hierarchies = hierarchies_.get();
#endif // __linux__
}