diff options
Diffstat (limited to 'test/storage/http_retry_network_status.cpp')
| -rw-r--r-- | test/storage/http_retry_network_status.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/storage/http_retry_network_status.cpp b/test/storage/http_retry_network_status.cpp index 3f8c469cf9..131186b5d7 100644 --- a/test/storage/http_retry_network_status.cpp +++ b/test/storage/http_retry_network_status.cpp @@ -4,6 +4,7 @@ #include <mbgl/storage/default_file_source.hpp> #include <mbgl/storage/network_status.hpp> +#include <mbgl/util/run_loop.hpp> // Test for https://github.com/mapbox/mapbox-gl-native/issues/2123 @@ -18,11 +19,12 @@ TEST_F(Storage, HTTPNetworkStatusChange) { using namespace mbgl; DefaultFileSource fs(nullptr); + util::RunLoop loop(uv_default_loop()); const Resource resource { Resource::Unknown, "http://127.0.0.1:3000/delayed" }; // This request takes 200 milliseconds to answer. - Request* req = fs.request(resource, uv_default_loop(), [&](const Response& res) { + Request* req = fs.request(resource, [&](const Response& res) { fs.cancel(req); EXPECT_EQ(nullptr, res.error); EXPECT_EQ(false, res.stale); @@ -31,6 +33,7 @@ TEST_F(Storage, HTTPNetworkStatusChange) { EXPECT_EQ(0, res.expires); EXPECT_EQ(0, res.modified); EXPECT_EQ("", res.etag); + loop.stop(); HTTPNetworkStatusChange.finish(); }); @@ -56,11 +59,12 @@ TEST_F(Storage, HTTPNetworkStatusChangePreempt) { using namespace mbgl; DefaultFileSource fs(nullptr); + util::RunLoop loop(uv_default_loop()); const auto start = uv_hrtime(); const Resource resource{ Resource::Unknown, "http://127.0.0.1:3001/test" }; - Request* req = fs.request(resource, uv_default_loop(), [&](const Response& res) { + Request* req = fs.request(resource, [&](const Response& res) { static int counter = 0; const auto duration = double(uv_hrtime() - start) / 1e9; if (counter == 0) { @@ -92,6 +96,7 @@ TEST_F(Storage, HTTPNetworkStatusChangePreempt) { if (counter++ == 1) { fs.cancel(req); + loop.stop(); HTTPNetworkStatusChangePreempt.finish(); } }); |