Changeset 82892 in webkit

Timestamp:

Apr 4, 2011 4:31:00 PM (13 years ago)

Author:

tony@chromium.org

Message:

2011-04-04 Tony Chang <​tony@chromium.org>

Reviewed by Ojan Vafai.

[chromium] don't write .checksum files if a fallback platform has an embedded checksum
​https://bugs.webkit.org/show_bug.cgi?id=57783

• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-04  Tony Chang  <tony@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        [chromium] don't write .checksum files if a fallback platform has an embedded checksum
+        https://bugs.webkit.org/show_bug.cgi?id=57783
+
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py:
+
 2011-04-04  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py

@@ -392 +392 @@
                 continue
 
-            if suffix == '.checksum' and self._png_has_same_checksum(temp_name, expected_fullpath):
+            if suffix == '.checksum' and self._png_has_same_checksum(temp_name, test, expected_fullpath):
+                self._filesystem.remove(temp_name)
                 # If an old checksum exists, delete it.
                 self._delete_baseline(expected_fullpath)
@@ -424 +425 @@
         return temp_name
 
-    def _png_has_same_checksum(self, checksum_path, checksum_expected_fullpath):
-        """Returns True if the png file next to |checksum_expected_fullpath|
+    def _png_has_same_checksum(self, checksum_path, test, checksum_expected_fullpath):
+        """Returns True if the fallback png for |checksum_expected_fullpath|
         contains the same checksum."""
         fs = self._filesystem
-        png_fullpath = fs.splitext(checksum_expected_fullpath)[0] + '.png'
+        png_fullpath = self._first_fallback_png_for_test(test)
+
         if not fs.exists(png_fullpath):
             _log.error('  Checksum without png file found! Expected %s to exist.' % png_fullpath)
@@ -442 +444 @@
             return checksum_in_text_file == checksum_in_png
 
+    def _first_fallback_png_for_test(self, test):
+        test_filepath = self._filesystem.join(self._target_port.layout_tests_dir(), test)
+        all_baselines = self._rebaseline_port.expected_baselines(
+            test_filepath, '.png', True)
+        return self._filesystem.join(all_baselines[0][0], all_baselines[0][1])
+
     def _is_dup_baseline(self, new_baseline, baseline_path, test, suffix, platform):
         """Check whether a baseline is duplicate and can fallback to same
@@ -449 +457 @@
 
         Args:
-          expected_filename: baseline expectation file name.
+          new_baseline: temp filename containing the new baseline results
+          baseline_path: baseline expectation file name.
           test: test name.
           suffix: file suffix of the expected results, including dot;

trunk/Tools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests_unittest.py

@@ -289 +289 @@
         self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None), None)
 
+    def test_png_file_with_comment_as_duplicate(self):
+        rebaseliner, filesystem = self.make_rebaseliner(
+            "BUGX REBASELINE MAC : failures/expected/image_checksum.html = IMAGE")
+        filesystem.files['/test.checkout/LayoutTests/platform/test-mac-snowleopard/failures/expected/image_checksum-expected.png'] = 'tEXtchecksum\x000123456789'
+        filesystem.files['/test.checkout/LayoutTests/platform/test-mac-snowleopard/failures/expected/image_checksum-expected.txt'] = 'png-comment-txt'
+
+        compile_success = rebaseliner._compile_rebaselining_tests()
+        self.assertTrue(compile_success)
+        self.assertEqual(set(['failures/expected/image_checksum.html']), rebaseliner._rebaselining_tests)
+        rebaseliner.run()
+        self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.png', None), None)
+        self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.txt', None), None)
+        self.assertEqual(filesystem.files.get('/test.checkout/LayoutTests/platform/test-mac-leopard/failures/expected/image_checksum-expected.checksum', None), None)
+
     def test_diff_baselines_txt(self):
         rebaseliner, filesystem = self.make_rebaseliner("")