You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/02/08 22:39:11 UTC
mesos git commit: Fixed flaky segfault in DockerFetcherPluginTest.
Repository: mesos
Updated Branches:
refs/heads/master 6cca8c807 -> 921aa8084
Fixed flaky segfault in DockerFetcherPluginTest.
Review: https://reviews.apache.org/r/43335/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/921aa808
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/921aa808
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/921aa808
Branch: refs/heads/master
Commit: 921aa8084868ea5699ce2fd025271229e6c942ee
Parents: 6cca8c8
Author: Gilbert Song <so...@gmail.com>
Authored: Mon Feb 8 13:38:58 2016 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Feb 8 13:38:58 2016 -0800
----------------------------------------------------------------------
src/tests/uri_fetcher_tests.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/921aa808/src/tests/uri_fetcher_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/uri_fetcher_tests.cpp b/src/tests/uri_fetcher_tests.cpp
index 6ffe3f4..dcfba78 100644
--- a/src/tests/uri_fetcher_tests.cpp
+++ b/src/tests/uri_fetcher_tests.cpp
@@ -22,6 +22,7 @@
#include <process/process.hpp>
#include <stout/check.hpp>
+#include <stout/duration.hpp>
#include <stout/gtest.hpp>
#include <stout/os.hpp>
#include <stout/path.hpp>
@@ -225,7 +226,7 @@ TEST_F(DockerFetcherPluginTest, INTERNET_CURL_FetchManifest)
string dir = path::join(os::getcwd(), "dir");
- AWAIT_READY(fetcher.get()->fetch(uri, dir));
+ AWAIT_READY_FOR(fetcher.get()->fetch(uri, dir), Seconds(60));
Try<string> _manifest = os::read(path::join(dir, "manifest"));
ASSERT_SOME(_manifest);
@@ -254,7 +255,7 @@ TEST_F(DockerFetcherPluginTest, INTERNET_CURL_FetchBlob)
string dir = path::join(os::getcwd(), "dir");
- AWAIT_READY(fetcher.get()->fetch(uri, dir));
+ AWAIT_READY_FOR(fetcher.get()->fetch(uri, dir), Seconds(60));
EXPECT_TRUE(os::exists(path::join(dir, digest)));
}
@@ -273,7 +274,7 @@ TEST_F(DockerFetcherPluginTest, INTERNET_CURL_FetchImage)
string dir = path::join(os::getcwd(), "dir");
- AWAIT_READY(fetcher.get()->fetch(uri, dir));
+ AWAIT_READY_FOR(fetcher.get()->fetch(uri, dir), Seconds(60));
Try<string> _manifest = os::read(path::join(dir, "manifest"));
ASSERT_SOME(_manifest);