Changeset 192569 in webkit

Timestamp:

Nov 18, 2015 3:02:43 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

Unreviewed. Fix webkitpy tests after r192568.

Instead of ignoring exception when closing mock fds, use a helper
function that the unit test can override to do nothing.

• Scripts/webkitpy/port/xvfbdriver.py:

(XvfbDriver._xvfb_close_pipe):
(XvfbDriver._xvfb_run):

• Scripts/webkitpy/port/xvfbdriver_unittest.py:

(XvfbDriverTest.make_driver):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2015-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Unreviewed. Fix webkitpy tests after r192568.
+
+        Instead of ignoring exception when closing mock fds, use a helper
+        function that the unit test can override to do nothing.
+
+        * Scripts/webkitpy/port/xvfbdriver.py:
+        (XvfbDriver._xvfb_close_pipe):
+        (XvfbDriver._xvfb_run):
+        * Scripts/webkitpy/port/xvfbdriver_unittest.py:
+        (XvfbDriverTest.make_driver):
+
 2015-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -73 +73 @@
         return int(display_id)
 
+    def _xvfb_close_pipe(self, pipe_fds):
+        os.close(pipe_fds[0])
+        os.close(pipe_fds[1])
+
     def _xvfb_run(self, environment):
         read_fd, write_fd = self._xvfb_pipe()
@@ -82 +86 @@
             display_id = self._xvfb_read_display_id(read_fd)
 
-        try:
-            os.close(read_fd)
-            os.close(write_fd)
-        except OSError:
-            pass
+        self._xvfb_close_pipe((read_fd, write_fd))
 
         return display_id

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

@@ -54 +54 @@
         driver._xvfb_screen_depth = lambda: '24'
         driver._xvfb_pipe = lambda: (3, 4)
-        driver._xvfb_read_display_id = lambda(x): 1
+        driver._xvfb_read_display_id = lambda x: 1
+        driver._xvfb_close_pipe = lambda p: None
         driver._environment = port.setup_environ_for_server(port.driver_name())
         return driver