Title: [204498] trunk/Tools
- Revision
- 204498
- Author
- [email protected]
- Date
- 2016-08-15 23:41:33 -0700 (Mon, 15 Aug 2016)
Log Message
webkitpy error in TestRunResults.merge()
https://bugs.webkit.org/show_bug.cgi?id=160882
Reviewed by Daniel Bates.
The argument to TestRunResults.merge() can be None if there are no device-specifc
initial results or retry results in Manager.run(), so just return early in that case.
* Scripts/webkitpy/layout_tests/models/test_run_results.py:
(TestRunResults.merge):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204497 => 204498)
--- trunk/Tools/ChangeLog 2016-08-16 06:24:39 UTC (rev 204497)
+++ trunk/Tools/ChangeLog 2016-08-16 06:41:33 UTC (rev 204498)
@@ -1,3 +1,16 @@
+2016-08-15 Simon Fraser <[email protected]>
+
+ webkitpy error in TestRunResults.merge()
+ https://bugs.webkit.org/show_bug.cgi?id=160882
+
+ Reviewed by Daniel Bates.
+
+ The argument to TestRunResults.merge() can be None if there are no device-specifc
+ initial results or retry results in Manager.run(), so just return early in that case.
+
+ * Scripts/webkitpy/layout_tests/models/test_run_results.py:
+ (TestRunResults.merge):
+
2016-08-15 Sam Weinig <[email protected]>
Speed up compile times by not including wtf/Variant.h so much
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py (204497 => 204498)
--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2016-08-16 06:24:39 UTC (rev 204497)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2016-08-16 06:41:33 UTC (rev 204498)
@@ -94,6 +94,8 @@
self.slow_tests.add(test_result.test_name)
def merge(self, test_run_results):
+ if not test_run_results:
+ return self
# self.expectations should be the same for both
self.total += test_run_results.total
self.remaining += test_run_results.remaining
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
