Changeset 129891 in webkit

Timestamp:

Sep 28, 2012 6:57:53 AM (12 years ago)

Author:

kkristof@inf.u-szeged.hu

Message:

[NRWT] XvfbDriver should choose the next free display
​https://bugs.webkit.org/show_bug.cgi?id=88414

Reviewed by Dirk Pranke.

This change how the XvfbDriver choose the next display. Before
this the choosing are based on the worker number but it caused
errors when several nrwt run on the same time. This add process
based free diplay search.

• Scripts/webkitpy/layout_tests/port/xvfbdriver.py:

(XvfbDriver.init):
(XvfbDriver._next_free_display):
(XvfbDriver._start):
(XvfbDriver.stop):

• Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py:

(XvfbDriverTest.make_driver):
(XvfbDriverTest.test_start_no_pixel_tests):
(XvfbDriverTest.test_start_pixel_tests):
(XvfbDriverTest.test_start_arbitrary_worker_number):
(XvfbDriverTest.test_next_free_display):
(XvfbDriverTest):
(XvfbDriverTest.test_start_next_worker):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/xvfbdriver.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-28  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
+
+        [NRWT] XvfbDriver should choose the next free display
+        https://bugs.webkit.org/show_bug.cgi?id=88414
+
+        Reviewed by Dirk Pranke.
+
+        This change how the XvfbDriver choose the next display. Before
+        this the choosing are based on the worker number but it caused
+        errors when several nrwt run on the same time. This add process
+        based free diplay search.
+
+        * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+        (XvfbDriver.__init__):
+        (XvfbDriver._next_free_display):
+        (XvfbDriver._start):
+        (XvfbDriver.stop):
+        * Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py:
+        (XvfbDriverTest.make_driver):
+        (XvfbDriverTest.test_start_no_pixel_tests):
+        (XvfbDriverTest.test_start_pixel_tests):
+        (XvfbDriverTest.test_start_arbitrary_worker_number):
+        (XvfbDriverTest.test_next_free_display):
+        (XvfbDriverTest):
+        (XvfbDriverTest.test_start_next_worker):
+
 2012-09-28  Huang Dongsung  <luxtella@company100.net>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py

@@ -29 +29 @@
 import logging
 import os
+import re
 
 from webkitpy.layout_tests.port.server_process import ServerProcess
 from webkitpy.layout_tests.port.driver import Driver
+from webkitpy.common.system.file_lock import FileLock
 
 _log = logging.getLogger(__name__)
@@ -37 +39 @@
 
 class XvfbDriver(Driver):
+    def __init__(self, *args, **kwargs):
+        Driver.__init__(self, *args, **kwargs)
+        self._guard_lock = None
+
+    def _next_free_display(self):
+        running_pids = self._port.host.executive.run_command(['ps', '-eo', 'comm,command'])
+        reserved_screens = set()
+        for pid in running_pids.split('\n'):
+            match = re.match('(Xvfb|Xorg).*\s:(?P<screen_number>\d+)', pid)
+            if match:
+                reserved_screens.add(int(match.group('screen_number')))
+        for i in range(99):
+            if i not in reserved_screens:
+                _guard_lock_file = self._port.host.filesystem.join('/tmp', 'WebKitXvfb.lock.%i' % i)
+                self._guard_lock = FileLock(_guard_lock_file)
+                if self._guard_lock.acquire_lock():
+                    return i
+
     def _start(self, pixel_tests, per_test_args):
-
-        # Collect the number of X servers running already and make
-        # sure our Xvfb process doesn't clash with any of them.
-        def x_filter(process_name):
-            return process_name.find("Xorg") > -1
-
-        running_displays = len(self._port.host.executive.running_pids(x_filter))
-
         # 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.
-        display_id = self._worker_number * 2 + running_displays
-        if pixel_tests:
-            display_id += 1
+        display_id = self._next_free_display()
         self._lock_file = "/tmp/.X%d-lock" % display_id
 
@@ -72 +82 @@
     def stop(self):
         super(XvfbDriver, self).stop()
+        if self._guard_lock:
+            self._guard_lock.release_lock()
+            self._guard_lock = None
         if getattr(self, '_xvfb_process', None):
             self._port.host.executive.kill_process(self._xvfb_process.pid)

trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver_unittest.py

@@ -31 +31 @@
 from webkitpy.common.system.deprecated_logging import log
 from webkitpy.common.system.filesystem_mock import MockFileSystem
+from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.outputcapture import OutputCapture
 from webkitpy.common.system.systemhost_mock import MockSystemHost
@@ -40 +41 @@
 
 class XvfbDriverTest(unittest.TestCase):
-    def make_driver(self, worker_number=0, xorg_running=False):
-        port = Port(host=MockSystemHost(log_executive=True), config=MockConfig())
+    def make_driver(self, worker_number=0, xorg_running=False, executive=None):
+        port = Port(host=MockSystemHost(log_executive=True, executive=executive), config=MockConfig())
         port._server_process_constructor = MockServerProcess
         if xorg_running:
@@ -62 +63 @@
     def test_start_no_pixel_tests(self):
         driver = self.make_driver()
-        expected_stderr = "MOCK running_pids: []\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
+        expected_stderr = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
         self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":0")
         self.cleanup_driver(driver)
@@ -68 +69 @@
     def test_start_pixel_tests(self):
         driver = self.make_driver()
-        expected_stderr = "MOCK running_pids: []\nMOCK popen: ['Xvfb', ':1', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
-        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":1", pixel_tests=True)
+        expected_stderr = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
+        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":0", pixel_tests=True)
         self.cleanup_driver(driver)
 
     def test_start_arbitrary_worker_number(self):
         driver = self.make_driver(worker_number=17)
-        expected_stderr = "MOCK running_pids: []\nMOCK popen: ['Xvfb', ':35', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
-        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":35", pixel_tests=True)
+        expected_stderr = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
+        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":0", pixel_tests=True)
         self.cleanup_driver(driver)
 
-    def test_start_existing_xorg_process(self):
-        driver = self.make_driver(xorg_running=True)
-        expected_stderr = "MOCK running_pids: [108]\nMOCK popen: ['Xvfb', ':1', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
-        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":1")
+    def test_next_free_display(self):
+        output = "Xorg            /usr/bin/X :0 -auth /var/run/lightdm/root/:0 -nolisten tcp vt7 -novtswitch -background none\nXvfb            Xvfb :1 -screen 0 800x600x24 -nolisten tcp"
+        executive = MockExecutive2(output)
+        driver = self.make_driver(executive=executive)
+        self.assertEqual(driver._next_free_display(), 2)
+        self.cleanup_driver(driver)
+        output = "Xvfb            Xvfb :0 -screen 0 800x600x24 -nolisten tcp"
+        executive = MockExecutive2(output)
+        driver = self.make_driver(executive=executive)
+        self.assertEqual(driver._next_free_display(), 1)
+        self.cleanup_driver(driver)
+        output = "Xvfb            Xvfb :1 -screen 0 800x600x24 -nolisten tcp\nXvfb            Xvfb :0 -screen 0 800x600x24 -nolisten tcp\nXvfb            Xvfb :3 -screen 0 800x600x24 -nolisten tcp"
+        executive = MockExecutive2(output)
+        driver = self.make_driver(executive=executive)
+        self.assertEqual(driver._next_free_display(), 2)
+        self.cleanup_driver(driver)
+
+    def test_start_next_worker(self):
+        driver = self.make_driver()
+        driver._next_free_display = lambda: 0
+        expected_stderr = "MOCK popen: ['Xvfb', ':0', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
+        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":0", pixel_tests=True)
+        self.cleanup_driver(driver)
+        driver = self.make_driver()
+        driver._next_free_display = lambda: 3
+        expected_stderr = "MOCK popen: ['Xvfb', ':3', '-screen', '0', '800x600x24', '-nolisten', 'tcp']\n"
+        self.assertDriverStartSuccessful(driver, expected_stderr=expected_stderr, expected_display=":3", pixel_tests=True)
         self.cleanup_driver(driver)