Bug 135381 - [webkitpy] Make diff_text generate correct diff if there is no newline at the end of file
Summary: [webkitpy] Make diff_text generate correct diff if there is no newline at the...
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKit Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Nobody
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-07-29 06:11 PDT by Tibor Mészáros
Modified: 2014-07-31 09:24 PDT (History)
5 users (show)

See Also:


Attachments
Patch (2.24 KB, patch)
2014-07-29 06:20 PDT, Tibor Mészáros
no flags Details | Formatted Diff | Diff
Archive of layout-test-results from webkit-ews-10 for mac-mountainlion-wk2 (553.84 KB, application/zip)
2014-07-29 07:52 PDT, Build Bot
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Tibor Mészáros 2014-07-29 06:11:41 PDT
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
+
+"
Comment 1 Tibor Mészáros 2014-07-29 06:20:51 PDT
Created attachment 235681 [details]
Patch

Patch with unit test
Comment 2 Build Bot 2014-07-29 07:52:18 PDT
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
Comment 3 Build Bot 2014-07-29 07:52:21 PDT
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
Comment 4 WebKit Commit Bot 2014-07-31 09:24:22 PDT
Comment on attachment 235681 [details]
Patch

Clearing flags on attachment: 235681

Committed r171856: <http://trac.webkit.org/changeset/171856>
Comment 5 WebKit Commit Bot 2014-07-31 09:24:25 PDT
All reviewed patches have been landed.  Closing bug.