Title: [90151] trunk/Tools
- Revision
- 90151
- Author
- [email protected]
- Date
- 2011-06-30 12:34:20 -0700 (Thu, 30 Jun 2011)
Log Message
2011-06-30 Eric Seidel <[email protected]>
Reviewed by Adam Barth.
Rename should_kill_dump_render_tree to driver_needs_restart in preparation for supporting WebKitTestRunner
https://bugs.webkit.org/show_bug.cgi?id=63743
* Scripts/webkitpy/layout_tests/layout_package/test_failures.py:
* Scripts/webkitpy/layout_tests/layout_package/worker.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90150 => 90151)
--- trunk/Tools/ChangeLog 2011-06-30 19:32:45 UTC (rev 90150)
+++ trunk/Tools/ChangeLog 2011-06-30 19:34:20 UTC (rev 90151)
@@ -1,3 +1,13 @@
+2011-06-30 Eric Seidel <[email protected]>
+
+ Reviewed by Adam Barth.
+
+ Rename should_kill_dump_render_tree to driver_needs_restart in preparation for supporting WebKitTestRunner
+ https://bugs.webkit.org/show_bug.cgi?id=63743
+
+ * Scripts/webkitpy/layout_tests/layout_package/test_failures.py:
+ * Scripts/webkitpy/layout_tests/layout_package/worker.py:
+
2011-06-30 Martin Robinson <[email protected]>
Reviewed by Anders Carlsson.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py (90150 => 90151)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py 2011-06-30 19:32:45 UTC (rev 90150)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py 2011-06-30 19:34:20 UTC (rev 90151)
@@ -103,8 +103,8 @@
"""Returns the string/JSON representation of a TestFailure."""
return cPickle.dumps(self)
- def should_kill_dump_render_tree(self):
- """Returns True if we should kill DumpRenderTree before the next test."""
+ def driver_needs_restart(self):
+ """Returns True if we should kill DumpRenderTree/WebKitTestRunner before the next test."""
return False
@@ -117,7 +117,7 @@
def message():
return "Test timed out"
- def should_kill_dump_render_tree(self):
+ def driver_needs_restart(self):
return True
@@ -131,7 +131,7 @@
# FIXME: This is wrong for WebKit2 (which uses WebKitTestRunner).
return "DumpRenderTree crashed"
- def should_kill_dump_render_tree(self):
+ def driver_needs_restart(self):
return True
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py (90150 => 90151)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py 2011-06-30 19:32:45 UTC (rev 90150)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py 2011-06-30 19:34:20 UTC (rev 90151)
@@ -179,7 +179,7 @@
if result.failures:
# Check and kill DumpRenderTree if we need to.
- if any([f.should_kill_dump_render_tree() for f in result.failures]):
+ if any([f.driver_needs_restart() for f in result.failures]):
self.kill_driver()
# Reset the batch count since the shell just bounced.
self._batch_count = 0
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
