Changeset 83759 in webkit

Timestamp:

Apr 13, 2011 1:58:13 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-13 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Ojan Vafai.

new-run-webkit-tests: suppress extraneous pretty patch warnings
​https://bugs.webkit.org/show_bug.cgi?id=58295

NRWT wasn't being careful about when it logged messages from
PrettyPatch not being available; it should only log during
check_build(), and be silent otherwise. This was causing us to
get multiple errors at runtime, which was confusing.

• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/base_unittest.py:
• Scripts/webkitpy/layout_tests/port/chromium.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (4 diffs, 1 prop)
• Scripts/webkitpy/layout_tests/port/base_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-13  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Ojan Vafai.
+
+        new-run-webkit-tests: suppress extraneous pretty patch warnings
+        https://bugs.webkit.org/show_bug.cgi?id=58295
+
+        NRWT wasn't being careful about when it logged messages from
+        PrettyPatch not being available; it should only log during
+        check_build(), and be silent otherwise. This was causing us to
+        get multiple errors at runtime, which was confusing.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2011-04-13  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -133 +133 @@
         self._pretty_patch_path = self.path_from_webkit_base("Websites",
             "bugs.webkit.org", "PrettyPatch", "prettify.rb")
-        # If we're running on a mocked-out filesystem, this file almost
-        # certainly won't be available, so it's a good test to keep us
-        # from erroring out later.
-        self._pretty_patch_available = self._filesystem.exists(self._pretty_patch_path)
+        self._pretty_patch_available = None
+
         if not hasattr(self._options, 'configuration') or self._options.configuration is None:
             self._options.configuration = self.default_configuration()
@@ -180 +178 @@
         raise NotImplementedError('Port.check_image_diff')
 
-    def check_pretty_patch(self):
+    def check_pretty_patch(self, logging=True):
         """Checks whether we can use the PrettyPatch ruby script."""
-
         # check if Ruby is installed
         try:
@@ -188 +185 @@
         except OSError, e:
             if e.errno in [errno.ENOENT, errno.EACCES, errno.ECHILD]:
-                _log.error("Ruby is not installed; "
-                           "can't generate pretty patches.")
+                if logging:
+                    _log.error("Ruby is not installed; can't generate pretty patches.")
+                    _log.error('')
+                return False
+
+        if not self.path_exists(self._pretty_patch_path):
+            if logging:
+                _log.error("Unable to find %s; can't generate pretty patches." % self._pretty_patch_path)
                 _log.error('')
-                return False
-
-        if not self.path_exists(self._pretty_patch_path):
-            _log.error('Unable to find %s .' % self._pretty_patch_path)
-            _log.error("Can't generate pretty patches.")
-            _log.error('')
             return False
 
@@ -759 +756 @@
 
     def pretty_patch_text(self, diff_path):
+        if self._pretty_patch_available is None:
+            self._pretty_patch_available = self.check_pretty_patch(logging=False)
         if not self._pretty_patch_available:
             return self._pretty_patch_error_html

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

@@ -87 +87 @@
     def test_pretty_patch_script_error(self):
         # FIXME: This is some ugly white-box test hacking ...
-        base._pretty_patch_available = True
         port = base.Port(executive=executive_mock.MockExecutive2(exception=ScriptError))
+        port._pretty_patch_available = True
         self.assertEqual(port.pretty_patch_text("patch.txt"),
                          port._pretty_patch_error_html)

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

@@ -109 +109 @@
         # It's okay if pretty patch isn't available, but we will at
         # least log a message.
-        self.check_pretty_patch()
+        self._pretty_patch_available = self.check_pretty_patch()
 
         return result