[chromium] Unreviewed, fix a bug where we don't properly shutdown lighttpd.
authortony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Jan 2013 19:35:07 +0000 (19:35 +0000)
committertony@chromium.org <tony@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 15 Jan 2013 19:35:07 +0000 (19:35 +0000)
* Scripts/webkitpy/layout_tests/servers/http_server.py:
(Lighttpd._check_and_kill): Pass /pid so taskkill.exe doesn't error out on us.
* Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
(TestHttpServer.test_win32_start_and_stop):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139764 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/servers/http_server.py
Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py

index 743f835..6a35f33 100644 (file)
@@ -1,3 +1,12 @@
+2013-01-15  Tony Chang  <tony@chromium.org>
+
+        [chromium] Unreviewed, fix a bug where we don't properly shutdown lighttpd.
+
+        * Scripts/webkitpy/layout_tests/servers/http_server.py:
+        (Lighttpd._check_and_kill): Pass /pid so taskkill.exe doesn't error out on us.
+        * Scripts/webkitpy/layout_tests/servers/http_server_unittest.py:
+        (TestHttpServer.test_win32_start_and_stop):
+
 2013-01-15  Joshua Bell  <jsbell@chromium.org>
 
         Unreviewed. Adding Michael Pruett as contributor.
index 7267be5..604f76b 100644 (file)
@@ -221,7 +221,7 @@ class Lighttpd(http_server_base.HttpServerBase):
                 # parent, so we can't use executive.kill_process().
                 #
                 # If this is actually working, we should figure out a clean API.
-                self._executive.run_command(["taskkill.exe", "/f", "/t", self._pid], error_handler=self._executive.ignore_error)
+                self._executive.run_command(["taskkill.exe", "/f", "/t", "/pid", self._pid], error_handler=self._executive.ignore_error)
             else:
                 self._executive.kill_process(self._pid)
             return False
index add9be0..f5be1b5 100644 (file)
@@ -97,4 +97,4 @@ class TestHttpServer(unittest.TestCase):
         server._wait_for_action = wait_for_action
 
         server.stop()
-        self.assertEquals(['taskkill.exe', '/f', '/t', 42], host.executive.calls[1])
+        self.assertEquals(['taskkill.exe', '/f', '/t', '/pid', 42], host.executive.calls[1])