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

Unified Diff: net/test/local_test_server.h

Issue 12033057: Make PPAPI test servers start in parallel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix nit Created 7 years, 11 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 | « chrome/test/ppapi/ppapi_test.cc ('k') | net/test/local_test_server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/test/local_test_server.h
diff --git a/net/test/local_test_server.h b/net/test/local_test_server.h
index 2b187396ac477b3f0c7e4091b7a460573d20a7f6..14b291d865c02b37d3baaf3cebc93fab87351c27 100644
--- a/net/test/local_test_server.h
+++ b/net/test/local_test_server.h
@@ -37,8 +37,29 @@ class LocalTestServer : public BaseTestServer {
virtual ~LocalTestServer();
+ // Start the test server and block until it's ready. Returns true on success.
bool Start() WARN_UNUSED_RESULT;
+ // Start the test server without blocking. Use this if you need multiple test
+ // servers (such as WebSockets and HTTP, or HTTP and HTTPS). You must call
+ // BlockUntilStarted on all servers your test requires before executing the
+ // test. For example:
+ //
+ // // Start the servers in parallel.
+ // ASSERT_TRUE(http_server.StartInBackground());
+ // ASSERT_TRUE(websocket_server.StartInBackground());
+ // // Wait for both servers to be ready.
+ // ASSERT_TRUE(http_server.BlockUntilStarted());
+ // ASSERT_TRUE(websocket_server.BlockUntilStarted());
+ // RunMyTest();
+ //
+ // Returns true on success.
+ bool StartInBackground() WARN_UNUSED_RESULT;
+
+ // Block until ths test server is ready. Returns true on success. See
+ // StartInBackground() documentation for more information.
+ bool BlockUntilStarted() WARN_UNUSED_RESULT;
+
// Stop the server started by Start().
bool Stop();
« no previous file with comments | « chrome/test/ppapi/ppapi_test.cc ('k') | net/test/local_test_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698