Title: [110079] trunk/Tools
- Revision
- 110079
- Author
- o...@chromium.org
- Date
- 2012-03-07 11:50:16 -0800 (Wed, 07 Mar 2012)
Log Message
garden-o-matic rebaseline is broken for ports that don't have a fallback port
https://bugs.webkit.org/show_bug.cgi?id=80526
Reviewed by Adam Barth.
Passing "None" as the fallback port throws an error in "webkit-patch rebaseline-test"
since there is no "None" port.
* Scripts/webkitpy/tool/servers/gardeningserver.py:
(GardeningHTTPRequestHandler.rebaseline):
* Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
(GardeningServerTest.test_rebaseline):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110078 => 110079)
--- trunk/Tools/ChangeLog 2012-03-07 19:44:28 UTC (rev 110078)
+++ trunk/Tools/ChangeLog 2012-03-07 19:50:16 UTC (rev 110079)
@@ -1,3 +1,18 @@
+2012-03-07 Ojan Vafai <o...@chromium.org>
+
+ garden-o-matic rebaseline is broken for ports that don't have a fallback port
+ https://bugs.webkit.org/show_bug.cgi?id=80526
+
+ Reviewed by Adam Barth.
+
+ Passing "None" as the fallback port throws an error in "webkit-patch rebaseline-test"
+ since there is no "None" port.
+
+ * Scripts/webkitpy/tool/servers/gardeningserver.py:
+ (GardeningHTTPRequestHandler.rebaseline):
+ * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+ (GardeningServerTest.test_rebaseline):
+
2012-03-07 James Robinson <jam...@chromium.org>
[chromium] Remove the TestWebPlugin's use of implicit FBO for offscreen contexts
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py (110078 => 110079)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2012-03-07 19:44:28 UTC (rev 110078)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2012-03-07 19:50:16 UTC (rev 110079)
@@ -137,13 +137,15 @@
def rebaseline(self):
builder = self.query['builder'][0]
- test = self.query['test'][0]
- self._run_webkit_patch([
+ command = [
'rebaseline-test',
builder,
- test,
- builders.fallback_port_name_for_new_port(builder),
- ])
+ self.query['test'][0],
+ ]
+ fallback_port = builders.fallback_port_name_for_new_port(builder)
+ if fallback_port:
+ command.append(fallback_port)
+ self._run_webkit_patch(command)
self._serve_text('success')
def optimizebaselines(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py (110078 => 110079)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py 2012-03-07 19:44:28 UTC (rev 110078)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py 2012-03-07 19:50:16 UTC (rev 110079)
@@ -184,7 +184,7 @@
def test_rebaseline(self):
builders._exact_matches = {"MOCK builder": {"port_name": "mock-port-name", "specifiers": set(["mock-specifier"])}}
- expected_stderr = "MOCK run_command: ['echo', 'rebaseline-test', 'MOCK builder', 'user-scripts/another-test.html', None], cwd=/mock-checkout\n"
+ expected_stderr = "MOCK run_command: ['echo', 'rebaseline-test', 'MOCK builder', 'user-scripts/another-test.html'], cwd=/mock-checkout\n"
expected_stdout = "== Begin Response ==\nsuccess\n== End Response ==\n"
self._post_to_path("/rebaseline?builder=MOCK+builder&test=user-scripts/another-test.html", expected_stderr=expected_stderr, expected_stdout=expected_stdout)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
