Changeset 83384 in webkit

Timestamp:

Apr 9, 2011 5:30:54 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-04-09 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Tony Chang.

It looks like NRWT has not been stopping DRT/TestShell
instances properly on windows, probably for a long time.
This would go a long way to explaining why we often have
processes lying around :)

​https://bugs.webkit.org/show_bug.cgi?id=57807

• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-09  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        It looks like NRWT has not been stopping DRT/TestShell
+        instances properly on windows, probably for a long time.
+        This would go a long way to explaining why we often have
+        processes lying around :)
+
+        https://bugs.webkit.org/show_bug.cgi?id=57807
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
 2011-04-09  Keith Kyzivat  <keith.kyzivat@nokia.com>
 

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

@@ -335 +335 @@
         self._worker_number = worker_number
         self._image_path = None
+        self.KILL_TIMEOUT = 3.0
         if self._port.get_option('pixel_tests'):
             self._image_path = self._port._filesystem.join(
@@ -513 +514 @@
             if self._proc.stderr:
                 self._proc.stderr.close()
-            if sys.platform not in ('win32', 'cygwin'):
-                # Closing stdin/stdout/stderr hangs sometimes on OS X,
-                # (see __init__(), above), and anyway we don't want to hang
-                # the harness if DRT is buggy, so we wait a couple
-                # seconds to give DRT a chance to clean up, but then
-                # force-kill the process if necessary.
-                KILL_TIMEOUT = 3.0
-                timeout = time.time() + KILL_TIMEOUT
-                # poll() is not threadsafe and can throw OSError due to:
-                # http://bugs.python.org/issue1731717
-                while self._proc.poll() is None and time.time() < timeout:
-                    time.sleep(0.1)
-                # poll() is not threadsafe and can throw OSError due to:
-                # http://bugs.python.org/issue1731717
-                if self._proc.poll() is None:
-                    _log.warning('stopping test driver timed out, '
-                                 'killing it')
-                    self._port._executive.kill_process(self._proc.pid)
+            # Closing stdin/stdout/stderr hangs sometimes on OS X,
+            # (see __init__(), above), and anyway we don't want to hang
+            # the harness if DRT is buggy, so we wait a couple
+            # seconds to give DRT a chance to clean up, but then
+            # force-kill the process if necessary.
+            timeout = time.time() + self.KILL_TIMEOUT
+            while self._proc.poll() is None and time.time() < timeout:
+                time.sleep(0.1)
+            if self._proc.poll() is None:
+                _log.warning('stopping test driver timed out, '
+                                'killing it')
+                self._port._executive.kill_process(self._proc.pid)
+            assert self._proc.poll() is not None
+            self._proc.wait()
+            self._proc = None

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

@@ -86 +86 @@
         self._assert_write_command_and_read_line(expected_crash=True)
 
+    def test_stop(self):
+        self.pid = None
+        self.wait_called = False
+        self.driver._proc = Mock()
+        self.driver._proc.pid = 1
+        self.driver._proc.stdin = StringIO.StringIO()
+        self.driver._proc.stdout = StringIO.StringIO()
+        self.driver._proc.stderr = StringIO.StringIO()
+        self.driver._proc.poll = lambda: None
+
+        def fake_wait():
+            self.assertTrue(self.pid is not None)
+            self.wait_called = True
+
+        self.driver._proc.wait = fake_wait
+
+        class FakeExecutive(object):
+            def kill_process(other, pid):
+                self.pid = pid
+                self.driver._proc.poll = lambda: 2
+
+        self.driver._port._executive = FakeExecutive()
+        self.driver.KILL_TIMEOUT = 0.01
+        self.driver.stop()
+        self.assertTrue(self.wait_called)
+        self.assertEquals(self.pid, 1)
 
 class ChromiumPortTest(unittest.TestCase):