Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DumpRenderTree2 to serve HTTP tests on http://127.0.0.1:8000

Browse Source 
Currently DumpRenderTree2 serves HTTP tests on http://localhost:8080.
Some of the tests hardcode 'http://127.0.0.1:8000' for resources, so
we must use this scheme and port for the requests to be same-origin.

This fixes LayoutTest http/tests/appcache/credential-url.html

Change-Id: I2a9c402fc7b0e0b62eb4a278d67ac0e63ef96e8b
This commit is contained in:
Steve Block
2010-09-17 15:41:11 +01:00
parent 062c0c9846
commit 76c97ee414
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/DumpRenderTree2/assets/run_apache2.py
View File

@@ -75,6 +75,10 @@ def main(options, args):
apache2_restart_template = "apache2 -k %s"
directives = " -c \"ServerRoot " + android_tree_root + "\""
# The default config in apache2-debian-httpd.conf listens on ports 8080 and
# 8443. We also need to listen on port 8000 for HTTP tests.
directives += " -c \"Listen 8000\""
# We use http/tests as the document root as the HTTP tests use hardcoded
# resources at the server root. We then use aliases to make available the
# complete set of tests and the required scripts.

8
tests/DumpRenderTree2/src/com/android/dumprendertree2/forwarder/ForwarderManager.java
View File

@@ -40,11 +40,9 @@ public class ForwarderManager {
* We use these ports because other webkit platforms do. They are set up in
* external/webkit/LayoutTests/http/conf/apache2-debian-httpd.conf
*/
public static final int HTTP_PORT = 8080;
public static final int HTTP_PORT = 8000;
public static final int HTTPS_PORT = 8443;
public static final String HOST = "localhost";
private static ForwarderManager forwarderManager;
private Set<Forwarder> mForwarders;
@@ -75,7 +73,7 @@ public class ForwarderManager {
URL url = null;
try {
url = new URL(protocol, HOST, port, "/");
url = new URL(protocol, HOST_IP, port, "/");
} catch (MalformedURLException e) {
assert false : "isHttps=" + isHttps;
}
@@ -122,4 +120,4 @@ public class ForwarderManager {
mIsStarted = false;
Log.i(LOG_TAG, "ForwarderManager stopped.");
}
}
}