Repository: mesos Updated Branches: refs/heads/master f480c7f20 -> 4635b66af
Fixed a bug in cgroups test filter. Review: https://reviews.apache.org/r/38819 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4635b66a Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4635b66a Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4635b66a Branch: refs/heads/master Commit: 4635b66af7caf024695f69f4ca07a57f2876ad29 Parents: f480c7f Author: Jie Yu <[email protected]> Authored: Mon Sep 28 12:45:20 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Mon Sep 28 13:56:31 2015 -0700 ---------------------------------------------------------------------- src/tests/environment.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4635b66a/src/tests/environment.cpp ---------------------------------------------------------------------- diff --git a/src/tests/environment.cpp b/src/tests/environment.cpp index 000b201..df33a6b 100644 --- a/src/tests/environment.cpp +++ b/src/tests/environment.cpp @@ -128,27 +128,29 @@ public: CgroupsFilter() { #ifdef __linux__ - Try<set<string> > hierarchies_ = cgroups::hierarchies(); - if (hierarchies_.isError()) { + Try<set<string> > hierarchies = cgroups::hierarchies(); + 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" + << hierarchies.error() << "\n" << "We'll disable the CgroupsNoHierarchyTest test fixture for now.\n" << "-------------------------------------------------------------" << std::endl; - } else if (!hierarchies_.get().empty()) { + + error = hierarchies.error(); + } else 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" + << strings::trim(stringify(hierarchies.get()), " {},") << "\n" << "We'll disable the CgroupsNoHierarchyTest test fixture for now.\n" << "-------------------------------------------------------------" << std::endl; - } else { - hierarchies = hierarchies_.get(); + + error = Error("Hierarchies exist"); } #endif // __linux__ } @@ -163,7 +165,7 @@ public: if (matches(test, "NOHIERARCHY_")) { return user.get() != "root" || !cgroups::enabled() || - !hierarchies.empty(); + error.isSome(); } return user.get() != "root" || !cgroups::enabled(); @@ -176,7 +178,7 @@ public: } private: - set<string> hierarchies; + Option<Error> error; };
