Title: [127734] trunk/Tools
- Revision
- 127734
- Author
- kbal...@webkit.org
- Date
- 2012-09-06 06:21:14 -0700 (Thu, 06 Sep 2012)
Log Message
[nrwt] Harden against empty stdout/stderr after stopping a crashed/timed out driver
https://bugs.webkit.org/show_bug.cgi?id=95710
Reviewed by Dirk Pranke.
The stdout / stderr output can be None so make sure
we won't raise an exception in this case.
* Scripts/webkitpy/layout_tests/port/driver.py:
(Driver.run_test):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (127733 => 127734)
--- trunk/Tools/ChangeLog 2012-09-06 13:05:38 UTC (rev 127733)
+++ trunk/Tools/ChangeLog 2012-09-06 13:21:14 UTC (rev 127734)
@@ -1,3 +1,16 @@
+2012-09-06 Balazs Kelemen <kbal...@webkit.org>
+
+ [nrwt] Harden against empty stdout/stderr after stopping a crashed/timed out driver
+ https://bugs.webkit.org/show_bug.cgi?id=95710
+
+ Reviewed by Dirk Pranke.
+
+ The stdout / stderr output can be None so make sure
+ we won't raise an exception in this case.
+
+ * Scripts/webkitpy/layout_tests/port/driver.py:
+ (Driver.run_test):
+
2012-09-06 Christophe Dumez <christophe.du...@intel.com>
[EFL] Sanitize URLs in EWebLauncher / Minibrowser
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py (127733 => 127734)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-09-06 13:05:38 UTC (rev 127733)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-09-06 13:21:14 UTC (rev 127734)
@@ -169,8 +169,10 @@
# We call stop() even if we crashed or timed out in order to get any remaining stdout/stderr output.
# In the timeout case, we kill the hung process as well.
out, err = self._server_process.stop(self._port.driver_stop_timeout() if stop_when_done else 0.0)
- text += out
- self.error_from_test += err
+ if out:
+ text += out
+ if err:
+ self.error_from_test += err
self._server_process = None
crash_log = None
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
