diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 21:58:06 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-22 21:58:06 +0000 |
| commit | d05aa247ac300beabb8b13bc5fab88b549a1af54 (patch) | |
| tree | 72b7b622f521ee2d407bf2d5213fcaf898412929 /net/proxy | |
| parent | de14f58d3647435e7377630d44c53ef0c7ed20af (diff) | |
| download | chromium_src-d05aa247ac300beabb8b13bc5fab88b549a1af54.zip chromium_src-d05aa247ac300beabb8b13bc5fab88b549a1af54.tar.gz chromium_src-d05aa247ac300beabb8b13bc5fab88b549a1af54.tar.bz2 | |
Refactor: Don't send the quit command before killing test server for ProxyScriptFetcherTest.NoCache. Instead we just murder the process directly.
Calling HttpTestServer::SendQuit() adds unnecessary latency since we need to wait for the sever to respond. But more importantly it is adding noise to my valgrind race investigation, since SendQuit() spins up its own IO thread to issue requests on (making the test have multiple threads that handle requests).
Review URL: http://codereview.chromium.org/320003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_script_fetcher_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc index 87f6a9a..ad28c10 100644 --- a/net/proxy/proxy_script_fetcher_unittest.cc +++ b/net/proxy/proxy_script_fetcher_unittest.cc @@ -193,8 +193,7 @@ TEST_F(ProxyScriptFetcherTest, NoCache) { } // Now kill the HTTP server. - server->SendQuit(); - EXPECT_TRUE(server->WaitToFinish(20000)); + EXPECT_TRUE(server->Stop()); // Verify it shutdown synchronously. server = NULL; // Try to fetch the file again -- if should fail, since the server is not |