Changeset 118882 in webkit

Timestamp:

May 29, 2012, 7:18:08 PM (14 years ago)

Author:

ojan@chromium.org

Message:

Show an error in the pretty diff when an image lacks a checksum
​https://bugs.webkit.org/show_bug.cgi?id=87791

Reviewed by Dirk Pranke.

• PrettyPatch/PrettyPatch.rb:
• PrettyPatch/PrettyPatch_test.rb:

Location:

trunk/Websites/bugs.webkit.org

Files:

• ChangeLog (modified) (1 diff)
• PrettyPatch/PrettyPatch.rb (modified) (3 diffs)
• PrettyPatch/PrettyPatch_test.rb (modified) (2 diffs)

trunk/Websites/bugs.webkit.org/ChangeLog

@@ +1 @@
+2012-05-29  Ojan Vafai  <ojan@chromium.org>
+
+        Show an error in the pretty diff when an image lacks a checksum
+        https://bugs.webkit.org/show_bug.cgi?id=87791
+
+        Reviewed by Dirk Pranke.
+
+        * PrettyPatch/PrettyPatch.rb:
+        * PrettyPatch/PrettyPatch_test.rb:
+
 2012-04-01  Adam Barth  <abarth@webkit.org>
 

trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch.rb

@@ -98 +98 @@
         Websites
     ]
+
+    IMAGE_CHECKSUM_ERROR = "<p>INVALID: Image lacks a checksum. This will fail with a MISSING error in run-webkit-tests. Always generate new png files using run-webkit-tests.</p>"
 
     def self.normalize_line_ending(s)
@@ -579 +581 @@
             image_snippet = "<img class='image' src='" + @image_url + "' />"
             if not @image_checksum then
-                return image_snippet
+                return IMAGE_CHECKSUM_ERROR + image_snippet
             end
             return "<p>" + @image_checksum + "</p>" + image_snippet
@@ -602 +604 @@
                         if image_checksum
                             str += image_checksum + "<br>"
+                        else
+                            str += IMAGE_CHECKSUM_ERROR + "<br>"
                         end
                         if image_url

trunk/Websites/bugs.webkit.org/PrettyPatch/PrettyPatch_test.rb

@@ -61 +61 @@
         assert_equal(0, $last_prettify_part_count["binary"], "Wrong number of 'binary' parts in " + description)
         assert_equal(0, $last_prettify_part_count["extract-error"], "Wrong number of 'extract-error' parts in " + description)
+        return pretty
     end
 
@@ -66 +67 @@
         PATCHES.each { |id, info| check_one_patch(id, info) }
     end
+
+    def test_images_without_checksum
+        pretty = check_one_patch(144064, ["Images without checksums", 10, 5, 4, 8])
+        puts pretty
+        matches = pretty.match("INVALID: Image lacks a checksum.")
+        assert(matches, "Should have invalid checksums")
+        # FIXME: This should only have 4 invalid images, but git apply needs an actual copy of the before binary
+        # in order to apply diffs correctly. The end result is that all images in the patch are empty and thus
+        # thought to have no checksum, instead of the 4 images that actually don't have a checksum.
+        assert_equal(10, pretty.scan(/INVALID\: Image lacks a checksum\./).size)
+    end
 end