Changeset 58005 in webkit

Timestamp:

Apr 21, 2010 12:49:28 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-04-21 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Dimitri Glazkov.

new-run-webkit-tests: fix a bug in the Chromium port where we would
try to talk to a crashed test_shell and raise exceptions that weren't
being caught.

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

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

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-21  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        new-run-webkit-tests: fix a bug in the Chromium port where we would
+        try to talk to a crashed test_shell and raise exceptions that weren't
+        being caught.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37941
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
 2010-04-21  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

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

@@ -322 +322 @@
         cmd += "\n"
 
-        self._proc.stdin.write(cmd)
-        line = self._proc.stdout.readline()
-        while line.rstrip() != "#EOF":
+        try:
+            self._proc.stdin.write(cmd)
+            line = self._proc.stdout.readline()
+        except IOError, e:
+            _log.error("IOError communicating w/ test_shell: " + str(e))
+            crash = True
+
+        while not crash and line.rstrip() != "#EOF":
             # Make sure we haven't crashed.
             if line == '' and self.poll() is not None:
@@ -357 +362 @@
                 error.append(line)
 
-            line = self._proc.stdout.readline()
+            try:
+                line = self._proc.stdout.readline()
+            except IOError, e:
+                _log.error("IOError while reading: " + str(e))
+                crash = True
 
         return (crash, timeout, actual_checksum, ''.join(output),