Bug 135381 – [webkitpy] Make diff_text generate correct diff if there is no newline at the end of file

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit Misc.

[Tibor Mészáros]

If only one line break is the difference between the actual and expected result, the pretty diff will fail.

Example:

actual result:
 "A\n\nB"

expected result:
"A\n\nB\n\n\n"

current diff:
"--- exp.txt
+++ act.txt
@@ -1,3 +1,5 @@
 A
 
-B+B
+
+"

expected diff:
"--- exp.txt
+++ act.txt
@@ -1,3 +1,5 @@
 A
 
-B
\ No newline at end of file
+B
+
+"

[Tibor Mészáros]

Created attachment 235681 [details]
Patch

Patch with unit test

[Build Bot]

Comment on attachment 235681 [details]
Patch

Attachment 235681 [details] did not pass mac-wk2-ews (mac-wk2):
Output: http://webkit-queues.appspot.com/results/4533226085285888

New failing tests:
media/track/add-and-remove-track.html

[Build Bot]

Created attachment 235690 [details]
Archive of layout-test-results from webkit-ews-10 for mac-mountainlion-wk2

The attached test failures were seen while running run-webkit-tests on the mac-wk2-ews.
Bot: webkit-ews-10  Port: mac-mountainlion-wk2  Platform: Mac OS X 10.8.5

[WebKit Commit Bot]

Comment on attachment 235681 [details]
Patch

Clearing flags on attachment: 235681

Committed r171856: <http://trac.webkit.org/changeset/171856>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.