Repository: mesos Updated Branches: refs/heads/master 7b3522b00 -> 98720acc1
Fix network isolator build Review: https://reviews.apache.org/r/24129 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/98720acc Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/98720acc Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/98720acc Branch: refs/heads/master Commit: 98720acc1fd4d3c8f8e507fbd23fa8646bf57a38 Parents: 7b3522b Author: Dominic Hamon <[email protected]> Authored: Wed Jul 30 15:26:34 2014 -0700 Committer: Dominic Hamon <[email protected]> Committed: Thu Jul 31 11:52:15 2014 -0700 ---------------------------------------------------------------------- src/tests/port_mapping_tests.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/98720acc/src/tests/port_mapping_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/port_mapping_tests.cpp b/src/tests/port_mapping_tests.cpp index 657463a..25d7579 100644 --- a/src/tests/port_mapping_tests.cpp +++ b/src/tests/port_mapping_tests.cpp @@ -117,7 +117,9 @@ static void cleanup(const string& eth0, const string& lo) } } - foreach (const string& file, os::ls(slave::BIND_MOUNT_ROOT)) { + Try<list<string> > entries = os::ls(slave::BIND_MOUNT_ROOT); + ASSERT_SOME(entries); + foreach (const string& file, entries.get()) { string target = path::join(slave::BIND_MOUNT_ROOT, file); // NOTE: Here, we ignore the unmount errors because previous tests @@ -1578,8 +1580,9 @@ TEST_F(PortMappingMesosTest, ROOT_CleanUpOrphanTest) } // Expect no files in bind mount directory. - list<string> files = os::ls(slave::BIND_MOUNT_ROOT); - EXPECT_EQ(0u, files.size()); + Try<list<string>> files = os::ls(slave::BIND_MOUNT_ROOT); + ASSERT_SOME(files); + EXPECT_EQ(0u, files.get().size()); driver.stop(); driver.join();
