Changeset 119030 in webkit

Timestamp:

May 30, 2012 8:05:34 PM (12 years ago)

Author:

Stephanie Lewis

Message:

​https://bugs.webkit.org/show_bug.cgi?id=87803
Layout tests often fail trying to stat nonexistent logs

Reviewed by Dirk Pranke.

CrashReporter removes logs using a heuristic to conserve space. Wrap a
try/catch block around accessing the logs as a precaution.

• Scripts/webkitpy/common/system/crashlogs.py:

(CrashLogs._find_newest_log_darwin):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/crashlogs.py (modified) (1 diff)
• Scripts/webkitpy/common/system/crashlogs_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-30  Stephanie Lewis  <slewis@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=87803
+        Layout tests often fail trying to stat nonexistent logs 
+
+        Reviewed by Dirk Pranke.
+
+        CrashReporter removes logs using a heuristic to conserve space.  Wrap a 
+        try/catch block around accessing the logs as a precaution.
+
+        * Scripts/webkitpy/common/system/crashlogs.py:
+        (CrashLogs._find_newest_log_darwin):
+
 2012-05-30  Gavin Peters  <gavinp@chromium.org>
 

trunk/Tools/Scripts/webkitpy/common/system/crashlogs.py

@@ -57 +57 @@
         errors = ''
         for path in reversed(sorted(logs)):
-            if not newer_than or self._host.filesystem.mtime(path) > newer_than:
-                try:
+            try:
+                if not newer_than or self._host.filesystem.mtime(path) > newer_than:
                     f = self._host.filesystem.read_text_file(path)
                     match = first_line_regex.match(f[0:f.find('\n')])
                     if match and match.group('process_name') == process_name and (pid is None or int(match.group('pid')) == pid):
                         return errors + f
-                except IOError, e:
-                    if include_errors:
-                        errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
+            except IOError, e:
+                if include_errors:
+                    errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
+            except OSError, e:
+                if include_errors:
+                    errors += "ERROR: Failed to read '%s': %s\n" % (path, str(e))
 
         if include_errors and errors:

trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py

@@ -76 +76 @@
             self.assertEqual(a.splitlines(), b.splitlines())
 
+
     def test_find_log_darwin(self):
         if not SystemHost().platform.is_mac():
@@ -106 +107 @@
 
         def bad_read(path):
-            raise IOError('No such file or directory')
+            raise IOError('IOError: No such file or directory')
+
+        def bad_mtime(path):
+            raise OSError('OSError: No such file or directory')
 
         filesystem.read_text_file = bad_read
         log = crash_logs.find_newest_log("DumpRenderTree", 28531, include_errors=True)
-        self.assertTrue('No such file or directory' in log)
+        self.assertTrue('IOError: No such file or directory' in log)
+
+        filesystem = MockFileSystem(files)
+        crash_logs = CrashLogs(MockSystemHost(filesystem=filesystem))
+        filesystem.mtime = bad_mtime
+        log = crash_logs.find_newest_log("DumpRenderTree", newer_than=1.0, include_errors=True)
+        self.assertTrue('OSError: No such file or directory' in log)