Title: [92752] trunk/Tools
- Revision
- 92752
- Author
- [email protected]
- Date
- 2011-08-10 00:36:49 -0700 (Wed, 10 Aug 2011)
Log Message
The URL we were computing for retrieving baselines was missing a slash
character because our mocks had an extra slash character. I've
corrected both the code and the mock.
* Scripts/webkitpy/tool/commands/rebaseline.py:
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
* Scripts/webkitpy/tool/mocktool.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (92751 => 92752)
--- trunk/Tools/ChangeLog 2011-08-10 07:35:13 UTC (rev 92751)
+++ trunk/Tools/ChangeLog 2011-08-10 07:36:49 UTC (rev 92752)
@@ -1,3 +1,13 @@
+2011-08-10 Adam Barth <[email protected]>
+
+ The URL we were computing for retrieving baselines was missing a slash
+ character because our mocks had an extra slash character. I've
+ corrected both the code and the mock.
+
+ * Scripts/webkitpy/tool/commands/rebaseline.py:
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ * Scripts/webkitpy/tool/mocktool.py:
+
2011-08-09 Adam Barth <[email protected]>
Move the quote mark to the right place.
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (92751 => 92752)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2011-08-10 07:35:13 UTC (rev 92751)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2011-08-10 07:36:49 UTC (rev 92752)
@@ -91,7 +91,7 @@
results_url = self._results_url(builder_name)
baseline_directory = self._baseline_directory(builder_name)
- source_baseline = "%s%s" % (results_url, self._file_name_for_actual_result(test_name, suffix))
+ source_baseline = "%s/%s" % (results_url, self._file_name_for_actual_result(test_name, suffix))
target_baseline = os.path.join(baseline_directory, self._file_name_for_expected_result(test_name, suffix))
print "Retrieving %s." % source_baseline
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (92751 => 92752)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-10 07:35:13 UTC (rev 92751)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2011-08-10 07:36:49 UTC (rev 92752)
@@ -44,7 +44,7 @@
def test_rebaseline_test(self):
command = RebaselineTest()
command.bind_to_tool(MockTool())
- expected_stdout = "Retrieving http://example.com/f/builders/Webkit Linux/results/userscripts/another-test-actual.txt.\n"
+ expected_stdout = "Retrieving http://example.com/f/builders/Webkit Linux/results/layout-test-results/userscripts/another-test-actual.txt.\n"
OutputCapture().assert_outputs(self, command._rebaseline_test, ["Webkit Linux", "userscripts/another-test.html", "txt"], expected_stdout=expected_stdout)
def test_rebaseline_expectations(self):
Modified: trunk/Tools/Scripts/webkitpy/tool/mocktool.py (92751 => 92752)
--- trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2011-08-10 07:35:13 UTC (rev 92751)
+++ trunk/Tools/Scripts/webkitpy/tool/mocktool.py 2011-08-10 07:36:49 UTC (rev 92752)
@@ -398,10 +398,10 @@
return self._name
def results_url(self):
- return "http://example.com/builders/%s/results/" % self.name()
+ return "http://example.com/builders/%s/results" % self.name()
def accumulated_results_url(self):
- return "http://example.com/f/builders/%s/results/" % self.name()
+ return "http://example.com/f/builders/%s/results/layout-test-results" % self.name()
def force_build(self, username, comments):
log("MOCK: force_build: name=%s, username=%s, comments=%s" % (
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
