zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Switch test_sky from apache to sky_server

Browse Source 
After this CL, test_sky uses the same server as skydb.

R=eseidel@chromium.org, ojan@chromium.org

Review URL: https://codereview.chromium.org/699333002
This commit is contained in:
Adam Barth
2014-11-04 16:42:29 -08:00
parent 79fb5e2c48
commit 100f37194c
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
engine/src/flutter/tests/parser/script-expected.txt
View File

@@ -1,17 +1,17 @@
ERROR: Uncaught SyntaxError: Unexpected token <
SOURCE: http://127.0.0.1:8000/parser/script.sky:6
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:6
ERROR: Uncaught SyntaxError: Unexpected token <
SOURCE: http://127.0.0.1:8000/parser/script.sky:14
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:14
ERROR: Uncaught SyntaxError: Unexpected token <
SOURCE: http://127.0.0.1:8000/parser/script.sky:21
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:21
ERROR: Uncaught ReferenceError: TEST is not defined
SOURCE: http://127.0.0.1:8000/parser/script.sky:27
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:27
ERROR: Uncaught SyntaxError: Invalid regular expression: missing /
SOURCE: http://127.0.0.1:8000/parser/script.sky:34
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:34
ERROR: Uncaught SyntaxError: Invalid regular expression: missing /
SOURCE: http://127.0.0.1:8000/parser/script.sky:38
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:38
ERROR: Uncaught SyntaxError: Unexpected token }
SOURCE: http://127.0.0.1:8000/parser/script.sky:43
SOURCE: http://127.0.0.1:8000/sky/tests/parser/script.sky:43
<html>
<import src="../resources/dump-as-markup.sky"></import>
<body>

2
engine/src/flutter/tests/services/network-expected.txt
View File

@@ -1,4 +1,4 @@
CONSOLE: LOG: url => http://127.0.0.1:8000/services/resources/pass.txt
CONSOLE: LOG: url => http://127.0.0.1:8000/sky/tests/services/resources/pass.txt
CONSOLE: LOG: status_line => HTTP/1.1 200 OK
CONSOLE: LOG: mime_type => text/plain
CONSOLE: LOG: read 31 bytes

2
engine/src/flutter/tests/services/network.sky
View File

@@ -23,7 +23,7 @@ describe('Mojo network_service', function() {
loader.URLLoader.stubClass,
loader.URLLoader.proxyClass);
var urlRequest = new loader.URLRequest();
urlRequest.url = "http://127.0.0.1:8000/services/resources/pass.txt";
urlRequest.url = "http://127.0.0.1:8000/sky/tests/services/resources/pass.txt";
urlRequest.method = "GET";
urlRequest.auto_follow_redirects = true;
var urlRequestPromise = urlLoaderConnection.remote.start(urlRequest);

2
engine/src/flutter/tests/services/xhr.sky
View File

@@ -17,7 +17,7 @@ describe('XMLHttpRequest', function() {
assert.ok(false, "Got error: " + JSON.stringify(error));
done();
};
xhr.open("GET", "http://127.0.0.1:8000/services/resources/pass.txt");
xhr.open("GET", "http://127.0.0.1:8000/sky/tests/services/resources/pass.txt");
xhr.send();
});
});

5
engine/src/flutter/tools/sky_server
View File

@@ -44,12 +44,13 @@ def main():
args = parser.parse_args()
log_dir = os.path.abspath(os.getcwd())
print "%s logging to access_log.txt in %s" % (
parser.prog, log_dir)
config = {
'global': {
'server.socket_port': args.port,
'tools.staticdir.content_types' : {
'sky': 'text/sky',
},
'log.screen': args.verbose,
'log.access_log': os.path.join(log_dir, 'access_log.txt'),
# This causes some strange python exception??