Updated Branches: refs/heads/master b586c1042 -> 0b736cf67
Fixed the flaky pstree test. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0b736cf6 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0b736cf6 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0b736cf6 Branch: refs/heads/master Commit: 0b736cf675842a1acf0af2de260de2f17811ec4d Parents: b586c10 Author: Benjamin Mahler <bmah...@twitter.com> Authored: Fri Nov 15 15:36:07 2013 -0800 Committer: Benjamin Mahler <bmah...@twitter.com> Committed: Fri Nov 15 15:38:16 2013 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/0b736cf6/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp index 71c457e..a0b624b 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp @@ -523,7 +523,6 @@ TEST_F(OsTest, pstree) ASSERT_LE(1u, tree.get().children.size()); ASSERT_GE(2u, tree.get().children.size()); - EXPECT_EQ(grandchild, tree.get().children.front().process.pid); // Cleanup by killing the descendant processes. EXPECT_EQ(0, kill(grandchild, SIGKILL));