Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html (135198 => 135199)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html 2012-11-19 22:44:20 UTC (rev 135199)
@@ -32,10 +32,10 @@
script-src 'self' file: https://ajax.googleapis.com;
style-src 'self' 'unsafe-inline' file: https://ajax.googleapis.com http://fonts.googleapis.com;
font-src http://themes.googleusercontent.com;
- img-src 'self' https://ajax.googleapis.com http://build.chromium.org http://build.webkit.org file: http://127.0.0.1:8127;
- media-src http://build.chromium.org http://build.webkit.org http://127.0.0.1:8127;
- frame-src http://build.chromium.org http://build.webkit.org http://test-results.appspot.com http://127.0.0.1:8127;
- connect-src http://trac.webkit.org http://build.chromium.org http://build.webkit.org http://127.0.0.1:8127">
+ img-src 'self' https://ajax.googleapis.com http://build.chromium.org http://build.webkit.org;
+ media-src 'self' http://build.chromium.org http://build.webkit.org;
+ frame-src 'self' http://build.chromium.org http://build.webkit.org http://test-results.appspot.com;
+ connect-src 'self' http://trac.webkit.org http://build.chromium.org http://build.webkit.org">
<title>Garden-O-Matic</title>
<link rel="stylesheet" href=""
<link rel="stylesheet" href=""
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js (135198 => 135199)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js 2012-11-19 22:44:20 UTC (rev 135199)
@@ -56,7 +56,7 @@
checkout.isAvailable = function(callback)
{
net.ajax({
- url: config.kLocalServerURL + '/ping',
+ url: '/ping',
success: function() {
callback(true);
},
@@ -69,7 +69,7 @@
checkout.rollout = function(revision, reason, callback, checkoutUnavailable)
{
callIfCheckoutAvailable(function() {
- net.post(config.kLocalServerURL + '/rollout?' + $.param({
+ net.post('/rollout?' + $.param({
'revision': revision,
'reason': reason
}), function() {
@@ -88,7 +88,7 @@
tests[failureInfo.testName][failureInfo.builderName] =
base.uniquifyArray(base.flattenArray(failureInfo.failureTypeList.map(results.failureTypeToExtensionList)));
}
- net.post(config.kLocalServerURL + '/rebaselineall', JSON.stringify(tests), function() { callback() });
+ net.post('/rebaselineall', JSON.stringify(tests), function() { callback() });
}, checkoutUnavailable);
};
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js (135198 => 135199)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js 2012-11-19 22:44:20 UTC (rev 135199)
@@ -76,7 +76,7 @@
});
deepEqual(requests, [
- ["http://127.0.0.1:8127/rebaselineall",
+ ["/rebaselineall",
JSON.stringify({
"another/test.svg": {
"WebKit Linux": ["png"],
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js (135198 => 135199)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js 2012-11-19 22:44:20 UTC (rev 135199)
@@ -169,7 +169,6 @@
config.kTracURL = 'http://trac.webkit.org';
config.kBugzillaURL = 'https://bugs.webkit.org';
-config.kLocalServerURL = 'http://127.0.0.1:8127';
config.kRevisionAttr = 'data-revision';
config.kTestNameAttr = 'data-test-name';
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js (135198 => 135199)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js 2012-11-19 22:44:20 UTC (rev 135199)
@@ -42,7 +42,7 @@
statusView.addMessage(id, 'Performing rebaseline of ' + testName + '...');
checkout.rebaseline(failureInfoList, function() {
- statusView.addFinalMessage(id, 'Rebaseline done! Please land with "webkit-patch land-cowboy".');
+ statusView.addFinalMessage(id, 'Rebaseline done! Please land with "webkit-patch land-cowhand".');
}, function(failureInfo) {
statusView.addMessage(id, failureInfo.testName + ' on ' + ui.displayNameForBuilder(failureInfo.builderName));
}, function() {
@@ -61,7 +61,7 @@
statusView.addMessage(id, 'Updating expectations of ' + testName + '...');
checkout.updateExpectations(failureInfoList, function() {
- statusView.addFinalMessage(id, 'Expectations update done! Please land with "webkit-patch land-cowboy".');
+ statusView.addFinalMessage(id, 'Expectations update done! Please land with "webkit-patch land-cowhand".');
}, function() {
statusView.addFinalMessage(id, kCheckoutUnavailableMessage);
});
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js (135198 => 135199)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js 2012-11-19 22:44:20 UTC (rev 135199)
@@ -188,7 +188,7 @@
function resultsDirectoryURL(platform, builderName)
{
if (config.useLocalResults)
- return config.kLocalServerURL + '/localresult?path=';
+ return '/localresult?path=';
return resultsDirectoryListingURL(platform, builderName) + 'results/layout-test-results/';
}
Modified: trunk/Tools/ChangeLog (135198 => 135199)
--- trunk/Tools/ChangeLog 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/ChangeLog 2012-11-19 22:44:20 UTC (rev 135199)
@@ -1,3 +1,21 @@
+2012-11-19 Dimitri Glazkov <[email protected]>
+
+ [garden-o-matic] Switch frontend to use the gardeningserver.
+ https://bugs.webkit.org/show_bug.cgi?id=102712
+
+ Reviewed by Dirk Pranke.
+
+ Instead of serving garden-o-matic frontend as file, we now serve it from the gardening server. This enables
+ using garden-o-matic in a Chrome OS device, with a separate machine as a headless server.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/garden-o-matic.html: Changed CSP policy to use 'self'.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout.js: Removed now-unnecessary references to kLocalServerURL.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/checkout_unittests.js: Tweaked the test expectation.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/config.js: Removed kLocalServerURL.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/controllers.js: Spuriously updated the name of the webkit-patch command.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/scripts/results.js: Removed kLocalServerURL.
+ * Scripts/webkitpy/tool/servers/gardeningserver.py: Changed to use the new launch URL.
+
2012-11-19 Sheriff Bot <[email protected]>
Unreviewed, rolling out r135172.
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py (135198 => 135199)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2012-11-19 22:23:42 UTC (rev 135198)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2012-11-19 22:44:20 UTC (rev 135199)
@@ -48,7 +48,7 @@
def url(self, args=None):
# We can't use urllib.encode() here because that encodes spaces as plus signs and the buildbots don't decode those properly.
arg_string = ('?' + '&'.join("%s=%s" % (key, urllib.quote(value)) for (key, value) in args.items())) if args else ''
- return 'file://' + os.path.join(GardeningHTTPRequestHandler.STATIC_FILE_DIRECTORY, 'garden-o-matic.html' + arg_string)
+ return 'http://localhost:8127/garden-o-matic.html' + arg_string
class GardeningHTTPRequestHandler(ReflectionHandler):
