net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java - Issue 869083004: [Android] Revised initial commit of the HttpTestServer. (abandoned)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java

Issue 869083004: [Android] Revised initial commit of the HttpTestServer. (abandoned) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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 | « net/test/android/javatests/src/org/chromium/net/test/TestServerBuilder.java ('k') | testing/android/java/src/org/chromium/native_test/ChromeNativeTestInstrumentationTestRunner.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java

diff --git a/net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java b/net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java

index 67fa5629076248ee17843b0412a873e1f0a18c47..6459aa049c572352be63e0d11a2445b6f6c72e84 100644

--- a/net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java

+++ b/net/test/android/javatests/src/org/chromium/net/test/TestServerSpawner.java

@@ -161,6 +161,7 @@ public class TestServerSpawner extends BaseHttpTestServer {

mTestServer = new TestServerBuilder(new JSONObject(rawJson.toString())).build();

mTestServerThread = new Thread(mTestServer);

mTestServerThread.start();

+ mTestServer.waitForServerToStart();

status = HttpStatus.SC_OK;

JSONObject entityJson = new JSONObject();

@@ -188,7 +189,7 @@ public class TestServerSpawner extends BaseHttpTestServer {

status = HttpStatus.SC_FORBIDDEN;

}

- BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_0, status, reason);

+ BasicHttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, status, reason);

response.setEntity(responseEntity);

return response;

}