Changeset 57119 in webkit

Timestamp:

Apr 5, 2010 8:59:15 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-04-05 Chris Jerdonek <Chris Jerdonek>

Reviewed by Shinichiro Hamaji.

Fixed check-webkit-style issue where the script was prematurely
exiting when encountering deleted files in patches.

​https://bugs.webkit.org/show_bug.cgi?id=37122

• Scripts/webkitpy/style/checker.py:
  • Changed non-existent file message from ERROR to WARN.
  • StyleChecker.check_file() no longer raises an exception when a file is not found.

• Scripts/webkitpy/style/checker_unittest.py:
  • Updated unit tests as necessary.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (1 diff)
• Scripts/webkitpy/style/checker_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-05  Chris Jerdonek  <cjerdonek@webkit.org>
+
+        Reviewed by Shinichiro Hamaji.
+
+        Fixed check-webkit-style issue where the script was prematurely
+        exiting when encountering deleted files in patches.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37122
+
+        * Scripts/webkitpy/style/checker.py:
+          - Changed non-existent file message from ERROR to WARN.
+          - StyleChecker.check_file() no longer raises an exception when
+            a file is not found.
+
+        * Scripts/webkitpy/style/checker_unittest.py:
+          - Updated unit tests as necessary.
+
 2010-04-05  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/style/checker.py

@@ -679 +679 @@
 
         if not os_path_exists(file_path):
-            _log.error("File does not exist: %s" % file_path)
-            sys.exit(1)
+            _log.warn("Skipping non-existent file: %s" % file_path)
+            return
 
         _log.debug("Checking: " + file_path)

trunk/WebKitTools/Scripts/webkitpy/style/checker_unittest.py

@@ -642 +642 @@
 
         # Check the outcome.
-        self.assertRaises(SystemExit, self.call_check_file, file_path)
-        self.assertLog(["ERROR: File does not exist: "
-                        "file_does_not_exist.txt\n"])
+        self.call_check_file(file_path)
+        self.assert_attributes(None, None, None, "")
+        self.assertLog(['WARNING: Skipping non-existent file: '
+                        'file_does_not_exist.txt\n'])
 
     def test_check_file_on_skip_without_warning(self):