Changeset 118884 in webkit

Timestamp:

May 29, 2012, 8:15:25 PM (14 years ago)

Author:

ojan@chromium.org

Message:

Add a linter error for pngs that lack an embedded checksum
​https://bugs.webkit.org/show_bug.cgi?id=87793

Reviewed by Dirk Pranke.

• Scripts/read-checksum-from-png:
• Scripts/webkitpy/common/read_checksum_from_png.py: Renamed from Tools/Scripts/webkitpy/layout_tests/read_checksum_from_png.py.

(read_checksum):

• Scripts/webkitpy/common/read_checksum_from_png_unittest.py: Renamed from Tools/Scripts/webkitpy/layout_tests/read_checksum_from_png_unittest.py.

(ReadChecksumFromPngTest):
(ReadChecksumFromPngTest.test_read_checksum):

• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/style/checkers/png.py:

(PNGChecker.check):

• Scripts/webkitpy/style/checkers/png_unittest.py:

(PNGCheckerTest.test_check):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/read-checksum-from-png (modified) (1 diff)
• Scripts/webkitpy/common/read_checksum_from_png.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/read_checksum_from_png.py )
• Scripts/webkitpy/common/read_checksum_from_png_unittest.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/read_checksum_from_png_unittest.py ) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/style/checkers/png.py (modified) (2 diffs)
• Scripts/webkitpy/style/checkers/png_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-29  Ojan Vafai  <ojan@chromium.org>
+
+        Add a linter error for pngs that lack an embedded checksum
+        https://bugs.webkit.org/show_bug.cgi?id=87793
+
+        Reviewed by Dirk Pranke.
+
+        * Scripts/read-checksum-from-png:
+        * Scripts/webkitpy/common/read_checksum_from_png.py: Renamed from Tools/Scripts/webkitpy/layout_tests/read_checksum_from_png.py.
+        (read_checksum):
+        * Scripts/webkitpy/common/read_checksum_from_png_unittest.py: Renamed from Tools/Scripts/webkitpy/layout_tests/read_checksum_from_png_unittest.py.
+        (ReadChecksumFromPngTest):
+        (ReadChecksumFromPngTest.test_read_checksum):
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/style/checkers/png.py:
+        (PNGChecker.check):
+        * Scripts/webkitpy/style/checkers/png_unittest.py:
+        (PNGCheckerTest.test_check):
+
 2012-05-29  Stephanie Lewis  <slewis@apple.com>
 

trunk/Tools/Scripts/read-checksum-from-png

@@ -31 +31 @@
 import sys
 
-from webkitpy.layout_tests import read_checksum_from_png
+from webkitpy.common import read_checksum_from_png
 
 

trunk/Tools/Scripts/webkitpy/common/read_checksum_from_png_unittest.py

@@ -25 +25 @@
 import StringIO
 import unittest
-from webkitpy.layout_tests import read_checksum_from_png
+from webkitpy.common import read_checksum_from_png
 
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -37 +37 @@
 import re
 
+from webkitpy.common import find_files
+from webkitpy.common import read_checksum_from_png
 from webkitpy.common.memoized import memoized
 from webkitpy.common.system import path
-from webkitpy.common import find_files
 from webkitpy.common.system import logutils
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.common.system.systemhost import SystemHost
-from webkitpy.layout_tests import read_checksum_from_png
 from webkitpy.layout_tests.models.test_configuration import TestConfiguration
 from webkitpy.layout_tests.port import config as port_config

trunk/Tools/Scripts/webkitpy/style/checkers/png.py

@@ -28 +28 @@
 import re
 
+from webkitpy.common import read_checksum_from_png
 from webkitpy.common.system.systemhost import SystemHost
 from webkitpy.common.checkout.scm.detection import SCMDetector
-
 
 class PNGChecker(object):
@@ -48 +48 @@
         config_file_path = ""
         detection = self._detector.display_name()
+
+        if self._fs.exists(self._file_path):
+            with self._fs.open_binary_file_for_reading(self._file_path) as filehandle:
+                if not read_checksum_from_png.read_checksum(filehandle):
+                    self._handle_style_error(0, 'image/png', 5, "Image lacks a checksum. Generate pngs using run-webkit-tests to ensure they have a checksum.")
 
         if detection == "git":

trunk/Tools/Scripts/webkitpy/style/checkers/png_unittest.py

@@ -114 +114 @@
         self.assertEquals(len(errors), 1)
 
+        file_path = "foo.png"
+        fs.write_binary_file(file_path, "Dummy binary data")
+        scm = MockSCMDetector('git')
+        errors = []
+        checker = PNGChecker(file_path, mock_handle_style_error, scm, MockSystemHost(os_name='linux', filesystem=fs))
+        checker.check()
+        self.assertEquals(len(errors), 2)
+        self.assertEquals(errors[0], (0, 'image/png', 5, 'Image lacks a checksum. Generate pngs using run-webkit-tests to ensure they have a checksum.'))
 
 if __name__ == '__main__':