Changeset 128020 in webkit

Timestamp:

Sep 9, 2012 11:54:43 PM (12 years ago)

Author:

zandobersek@gmail.com

Message:

Clean up the code in XvfbDriver
​https://bugs.webkit.org/show_bug.cgi?id=96202

Reviewed by Philippe Normand.

Changes:

• Remove unneeded imports,
• assign the _lock_file member variable when the display number is determined,
• no need for parentheses around a single string format argument,
• use FileSystem.exists method when checking if lock file is present as it

makes the intention much more clearer.

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

(XvfbDriver._start):
(XvfbDriver.stop):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-09  Zan Dobersek  <zandobersek@gmail.com>
+
+        Clean up the code in XvfbDriver
+        https://bugs.webkit.org/show_bug.cgi?id=96202
+
+        Reviewed by Philippe Normand.
+
+        Changes:
+        - Remove unneeded imports,
+        - assign the _lock_file member variable when the display number is determined,
+        - no need for parentheses around a single string format argument,
+        - use FileSystem.exists method when checking if lock file is present as it
+        makes the intention much more clearer.
+
+        * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+        (XvfbDriver._start):
+        (XvfbDriver.stop):
+
 2012-09-09  Patrick Gansterer  <paroga@webkit.org>
 

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

@@ -29 +29 @@
 import logging
 import os
-import signal
-import subprocess
 
 from webkitpy.layout_tests.port.server_process import ServerProcess
 from webkitpy.layout_tests.port.driver import Driver
-from webkitpy.common.system.executive import Executive
 
 _log = logging.getLogger(__name__)
@@ -55 +52 @@
         if pixel_tests:
             display_id += 1
+        self._lock_file = "/tmp/.X%d-lock" % display_id
+
         run_xvfb = ["Xvfb", ":%d" % display_id, "-screen",  "0", "800x600x24", "-nolisten", "tcp"]
         with open(os.devnull, 'w') as devnull:
             self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull)
-        self._lock_file = "/tmp/.X%d-lock" % display_id
 
         server_name = self._port.driver_name()
         environment = self._port.setup_environ_for_server(server_name)
         # We must do this here because the DISPLAY number depends on _worker_number
-        environment['DISPLAY'] = ":%d" % (display_id)
+        environment['DISPLAY'] = ":%d" % display_id
+
         self._crashed_process_name = None
         self._crashed_pid = None
@@ -74 +73 @@
             self._port.host.executive.kill_process(self._xvfb_process.pid)
             self._xvfb_process = None
-            if self._port.host.filesystem.isfile(self._lock_file):
+            if self._port.host.filesystem.exists(self._lock_file):
                 self._port.host.filesystem.remove(self._lock_file)