2011-06-30 Eric Seidel <eric@webkit.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Jun 2011 19:34:20 +0000 (19:34 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 30 Jun 2011 19:34:20 +0000 (19:34 +0000)
        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90151 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/layout_package/test_failures.py
Tools/Scripts/webkitpy/layout_tests/layout_package/worker.py

index 86dabb5..ce1681d 100644 (file)
@@ -1,3 +1,13 @@
+2011-06-30  Eric Seidel  <eric@webkit.org>
+
+        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  <mrobinson@igalia.com>
 
         Reviewed by Anders Carlsson.
index d2bb761..9069333 100644 (file)
@@ -103,8 +103,8 @@ class TestFailure(object):
         """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 @@ class FailureTimeout(TestFailure):
     def message():
         return "Test timed out"
 
-    def should_kill_dump_render_tree(self):
+    def driver_needs_restart(self):
         return True
 
 
@@ -131,7 +131,7 @@ class FailureCrash(TestFailure):
         # 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
 
 
index 1f54a88..ea457e8 100644 (file)
@@ -179,7 +179,7 @@ class Worker(manager_worker_broker.AbstractWorker):
 
         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