Title: [137799] trunk/Tools
Revision
137799
Author
[email protected]
Date
2012-12-15 11:36:19 -0800 (Sat, 15 Dec 2012)

Log Message

Stop the XvfbDriver before proceeding with its starting setup
https://bugs.webkit.org/show_bug.cgi?id=105006

Reviewed by Philippe Normand.

Just as with the base Driver implementation, stop the XvfbDriver
before proceeding with setting up lock files and a new Xvfb instance.
This forces any driver or Xvfb instances that are currently under
the driver's control to be closed/killed and cleaned up after.

* Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
(XvfbDriver._start):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (137798 => 137799)


--- trunk/Tools/ChangeLog	2012-12-15 19:11:44 UTC (rev 137798)
+++ trunk/Tools/ChangeLog	2012-12-15 19:36:19 UTC (rev 137799)
@@ -1,3 +1,18 @@
+2012-12-15  Zan Dobersek  <[email protected]>
+
+        Stop the XvfbDriver before proceeding with its starting setup
+        https://bugs.webkit.org/show_bug.cgi?id=105006
+
+        Reviewed by Philippe Normand.
+
+        Just as with the base Driver implementation, stop the XvfbDriver
+        before proceeding with setting up lock files and a new Xvfb instance.
+        This forces any driver or Xvfb instances that are currently under
+        the driver's control to be closed/killed and cleaned up after.
+
+        * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+        (XvfbDriver._start):
+
 2012-12-14  Dirk Pranke  <[email protected]>
 
         webkitpy: make port_name a required parameter to the non-test ports

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py (137798 => 137799)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py	2012-12-15 19:11:44 UTC (rev 137798)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py	2012-12-15 19:36:19 UTC (rev 137799)
@@ -59,6 +59,8 @@
                     return i
 
     def _start(self, pixel_tests, per_test_args):
+        self.stop()
+
         # Use even displays for pixel tests and odd ones otherwise. When pixel tests are disabled,
         # DriverProxy creates two drivers, one for normal and the other for ref tests. Both have
         # the same worker number, so this prevents them from using the same Xvfb instance.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to