Title: [139764] trunk/Tools
- Revision
- 139764
- Author
- t...@chromium.org
- Date
- 2013-01-15 11:35:07 -0800 (Tue, 15 Jan 2013)
Log Message
[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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139763 => 139764)
--- trunk/Tools/ChangeLog 2013-01-15 19:25:38 UTC (rev 139763)
+++ trunk/Tools/ChangeLog 2013-01-15 19:35:07 UTC (rev 139764)
@@ -1,3 +1,12 @@
+2013-01-15 Tony Chang <t...@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 <jsb...@chromium.org>
Unreviewed. Adding Michael Pruett as contributor.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py (139763 => 139764)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2013-01-15 19:25:38 UTC (rev 139763)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server.py 2013-01-15 19:35:07 UTC (rev 139764)
@@ -221,7 +221,7 @@
# 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
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py (139763 => 139764)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py 2013-01-15 19:25:38 UTC (rev 139763)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_unittest.py 2013-01-15 19:35:07 UTC (rev 139764)
@@ -97,4 +97,4 @@
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])
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
