Changeset 58139 in webkit

Timestamp:

Apr 22, 2010 6:55:53 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-22 Eric Seidel <​eric@webkit.org>

Reviewed by Dimitri Glazkov.

new-run-webkit-tests --verbose shows ever-increasing #EOF lines
​https://bugs.webkit.org/show_bug.cgi?id=37794

• Scripts/webkitpy/layout_tests/port/webkit.py:
  • Remove the assert() since our ServerProcess code does not always seem to be reading the full stderr output (or we're not waiting for it to).

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-22  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        new-run-webkit-tests --verbose shows ever-increasing #EOF lines
+        https://bugs.webkit.org/show_bug.cgi?id=37794
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+         - Remove the assert() since our ServerProcess code does not always
+           seem to be reading the full stderr output (or we're not waiting for it to).
+
 2010-04-22  Eric Seidel  <eric@webkit.org>
 

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

@@ -448 +448 @@
         # we do not get any error lines from the server_process
         # probably we are not flushing stderr.
-        if error_lines:
-            error_eof = error_lines.pop()
-            assert(error_eof == "#EOF")
+        if error_lines and error_lines[-1] == "#EOF":
+            error_lines.pop()  # Remove the expected "#EOF"
         error = "\n".join(error_lines)
         # FIXME: This seems like the wrong section of code to be doing