third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py - Issue 2582293004: Remove use of wdiff from layout test runner.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

Issue 2582293004: Remove use of wdiff from layout test runner. (Closed)

Patch Set: Rebased Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/common/net/layout_test_results_unittest.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

index 838c9ab4b98236c360c1490b7fea029cb8c4ea00..48a4c0339d728711cf3ff4b63e9a55e8186ba7d1 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py

@@ -114,7 +114,6 @@ class TestResultWriter(object):

FILENAME_SUFFIX_CRASH_LOG = "-crash-log"

FILENAME_SUFFIX_SAMPLE = "-sample"

FILENAME_SUFFIX_LEAK_LOG = "-leak-log"

- FILENAME_SUFFIX_WDIFF = "-wdiff.html"

FILENAME_SUFFIX_HTML_DIFF = "-pretty-diff.html"

FILENAME_SUFFIX_IMAGE_DIFF = "-diff.png"

FILENAME_SUFFIX_IMAGE_DIFFS_HTML = "-diffs.html"

@@ -209,12 +208,6 @@ class TestResultWriter(object):

diff_filename = self.output_filename(self.FILENAME_SUFFIX_DIFF + file_type)

self._write_file(diff_filename, diff)

- # Shell out to wdiff to get colored inline diffs.

- if self._port.wdiff_available():

- wdiff = self._port.wdiff_text(expected_filename, actual_filename)

- wdiff_filename = self.output_filename(self.FILENAME_SUFFIX_WDIFF)

- self._write_file(wdiff_filename, wdiff)

# Output a HTML diff file.

html_diff_filename = self.output_filename(self.FILENAME_SUFFIX_HTML_DIFF)

html_diff_contents = html_diff(expected_text, actual_text)