mesos git commit: Fixed cgroups cpuacct stats test.

[tn...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/master 21ed374db -> f9a0d23a7


Fixed cgroups cpuacct stats test.

Review: https://reviews.apache.org/r/36529


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/f9a0d23a
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/f9a0d23a
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/f9a0d23a

Branch: refs/heads/master
Commit: f9a0d23a7f6428b8a1115009be23d97e1b3e6b83
Parents: 21ed374
Author: Jojy Varghese <jo...@mesosphere.io>
Authored: Wed Jul 15 15:39:01 2015 -0700
Committer: Timothy Chen <tn...@apache.org>
Committed: Wed Jul 15 15:39:43 2015 -0700

----------------------------------------------------------------------
 src/tests/cgroups_tests.cpp | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/f9a0d23a/src/tests/cgroups_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cgroups_tests.cpp b/src/tests/cgroups_tests.cpp
index a371ee2..ac431be 100644
--- a/src/tests/cgroups_tests.cpp
+++ b/src/tests/cgroups_tests.cpp
@@ -1196,6 +1196,9 @@ TEST_F(CgroupsAnyHierarchyWithCpuAcctMemoryTest, ROOT_CGROUPS_CpuAcctsStats)
 
   ASSERT_SOME(cgroups::cpuacct::stat(hierarchy, TEST_CGROUPS_ROOT));
 
+  // Move ourselves to the root cgroup.
+  CHECK_SOME(cgroups::assign(hierarchy, "", ::getpid()));
+
   AWAIT_READY(cgroups::destroy(hierarchy, TEST_CGROUPS_ROOT));
 }