Switch test_sky to sky_server

Adam did this in:
https://codereview.chromium.org/699333002
But later reverted in:
https://codereview.chromium.org/692333007

The problem was that the path to sky_server
was being computed relative to the sky
directory instead of being absolute, so when
the bots tried to run test_sky from the root
mojo directory instead of mojo/sky they failed.

TBR=abarth@chromium.org

Review URL: https://codereview.chromium.org/704833002
This commit is contained in:
Eric Seidel
2014-11-05 13:08:49 -08:00
parent 61f9361f67
commit 8b9bb313f1
4 changed files with 10 additions and 10 deletions

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>

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

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);

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();
});
});