Title: [101819] trunk/Tools
- Revision
- 101819
- Author
- [email protected]
- Date
- 2011-12-02 10:11:45 -0800 (Fri, 02 Dec 2011)
Log Message
[nrwt] fix wdiff output
https://bugs.webkit.org/show_bug.cgi?id=73604
Reviewed by Adam Barth.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.wdiff_text):
* Scripts/webkitpy/layout_tests/port/base_unittest.py:
(PortTest.test_wdiff_text):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101818 => 101819)
--- trunk/Tools/ChangeLog 2011-12-02 18:01:31 UTC (rev 101818)
+++ trunk/Tools/ChangeLog 2011-12-02 18:11:45 UTC (rev 101819)
@@ -1,3 +1,15 @@
+2011-12-02 Tony Chang <[email protected]>
+
+ [nrwt] fix wdiff output
+ https://bugs.webkit.org/show_bug.cgi?id=73604
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.wdiff_text):
+ * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+ (PortTest.test_wdiff_text):
+
2011-12-02 Adam Roben <[email protected]>
Teach build.webkit.org to display how many unit tests failed or timed out
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (101818 => 101819)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-12-02 18:01:31 UTC (rev 101818)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2011-12-02 18:11:45 UTC (rev 101819)
@@ -943,7 +943,7 @@
"""Returns a string of HTML indicating the word-level diff of the
contents of the two filenames. Returns an empty string if word-level
diffing isn't available."""
- if not self._wdiff_available:
+ if not self.wdiff_available():
return ""
try:
# It's possible to raise a ScriptError we pass wdiff invalid paths.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py (101818 => 101819)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2011-12-02 18:01:31 UTC (rev 101818)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2011-12-02 18:11:45 UTC (rev 101819)
@@ -147,6 +147,12 @@
# However wdiff should not be available after running wdiff_text if wdiff is missing.
self.assertFalse(port._wdiff_available)
+ def test_wdiff_text(self):
+ port = self.make_port()
+ port.wdiff_available = lambda: True
+ port._run_wdiff = lambda a, b: 'PASS'
+ self.assertEqual('PASS', port.wdiff_text(None, None))
+
def test_diff_text(self):
port = self.make_port()
# Make sure that we don't run into decoding exceptions when the
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
