Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(514)

Unified Diff: net/proxy/multi_threaded_proxy_resolver_unittest.cc

Issue 1138313003: Fix a race in MultiThreadedProxyResolverTest.ThreeThreads_Basic. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@multi-threaded-proxy-resolver-flake
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/multi_threaded_proxy_resolver_unittest.cc
diff --git a/net/proxy/multi_threaded_proxy_resolver_unittest.cc b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
index d270844a11afb31bde53e296a80303b763943bab..0c22a9c039c1571c7b27389f251ef4b22a409e92 100644
--- a/net/proxy/multi_threaded_proxy_resolver_unittest.cc
+++ b/net/proxy/multi_threaded_proxy_resolver_unittest.cc
@@ -555,6 +555,7 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
callback[1].callback(), &request[1],
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
+ factory().resolvers()[0]->WaitUntilBlocked();
rv = resolver().GetProxyForURL(GURL("http://request2"), &results[2],
callback[2].callback(), &request[2],
BoundNetLog());
@@ -569,6 +570,7 @@ TEST_F(MultiThreadedProxyResolverTest, ThreeThreads_Basic) {
callback[3].callback(), &request[3],
BoundNetLog());
EXPECT_EQ(ERR_IO_PENDING, rv);
+ factory().resolvers()[1]->WaitUntilBlocked();
rv = resolver().GetProxyForURL(GURL("http://request4"), &results[4],
callback[4].callback(), &request[4],
BoundNetLog());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698