Title: [126073] trunk/Tools
- Revision
- 126073
- Author
- [email protected]
- Date
- 2012-08-20 14:38:42 -0700 (Mon, 20 Aug 2012)
Log Message
Fix change for timeout detection to not crash if we have no output :)
https://bugs.webkit.org/show_bug.cgi?id=94505
Unreviewed, build fix.
* Scripts/webkitpy/layout_tests/port/driver.py:
(Driver.run_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (126072 => 126073)
--- trunk/Tools/ChangeLog 2012-08-20 21:34:11 UTC (rev 126072)
+++ trunk/Tools/ChangeLog 2012-08-20 21:38:42 UTC (rev 126073)
@@ -1,5 +1,15 @@
2012-08-20 Dirk Pranke <[email protected]>
+ Fix change for timeout detection to not crash if we have no output :)
+ https://bugs.webkit.org/show_bug.cgi?id=94505
+
+ Unreviewed, build fix.
+
+ * Scripts/webkitpy/layout_tests/port/driver.py:
+ (Driver.run_test):
+
+2012-08-20 Dirk Pranke <[email protected]>
+
temporarily disable ImageDiff on WK2 ports for ref tests
https://bugs.webkit.org/show_bug.cgi?id=94517
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py (126072 => 126073)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-08-20 21:34:11 UTC (rev 126072)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-08-20 21:38:42 UTC (rev 126073)
@@ -160,7 +160,7 @@
crashed = self.has_crashed()
timed_out = self._server_process.timed_out
- if 'Timed out waiting for final message from web process' in text:
+ if text and ('Timed out waiting for final message from web process' in text):
# FIXME: This is a hack to work around the issues in https://bugs.webkit.org/show_bug.cgi?id=94505.
# We need to either fix the underlying problem in WTR or return a more canonical error.
if not timed_out:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
