Title: [125316] trunk/Tools
- Revision
- 125316
- Author
- [email protected]
- Date
- 2012-08-10 12:49:22 -0700 (Fri, 10 Aug 2012)
Log Message
NRWT crashes when DRT with --encode-binary crashes just before it dumps pixels
https://bugs.webkit.org/show_bug.cgi?id=93728
Reviewed by Dirk Pranke.
* Scripts/webkitpy/layout_tests/port/driver.py:
(ContentBlock.decode_content): Check self.content is not None before calling base64.b64decode().
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (125315 => 125316)
--- trunk/Tools/ChangeLog 2012-08-10 19:41:20 UTC (rev 125315)
+++ trunk/Tools/ChangeLog 2012-08-10 19:49:22 UTC (rev 125316)
@@ -1,5 +1,15 @@
2012-08-10 Xianzhu Wang <[email protected]>
+ NRWT crashes when DRT with --encode-binary crashes just before it dumps pixels
+ https://bugs.webkit.org/show_bug.cgi?id=93728
+
+ Reviewed by Dirk Pranke.
+
+ * Scripts/webkitpy/layout_tests/port/driver.py:
+ (ContentBlock.decode_content): Check self.content is not None before calling base64.b64decode().
+
+2012-08-10 Xianzhu Wang <[email protected]>
+
[Chromium-Android][NRWT] Executable might not be pushed correctly when there are multiple builds
https://bugs.webkit.org/show_bug.cgi?id=93688
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py (125315 => 125316)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-08-10 19:41:20 UTC (rev 125315)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py 2012-08-10 19:49:22 UTC (rev 125316)
@@ -440,7 +440,7 @@
self.decoded_content = None
def decode_content(self):
- if self.encoding == 'base64':
+ if self.encoding == 'base64' and self.content is not None:
self.decoded_content = base64.b64decode(self.content)
else:
self.decoded_content = self.content
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
