Title: [114555] trunk/Tools
- Revision
- 114555
- Author
- jer.no...@apple.com
- Date
- 2012-04-18 13:47:54 -0700 (Wed, 18 Apr 2012)
Log Message
Lion Production Test failing with error: "Failed to stop httpd: pid file still exists" https://bugs.webkit.org/show_bug.cgi?id=84177
Reviewed by Dirk Pranke.
Try to delete the pid file left by Apache in the case it was killed forcefully.
* Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
(LayoutTestApacheHttpd._stop_running_server):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (114554 => 114555)
--- trunk/Tools/ChangeLog 2012-04-18 20:46:44 UTC (rev 114554)
+++ trunk/Tools/ChangeLog 2012-04-18 20:47:54 UTC (rev 114555)
@@ -1,3 +1,15 @@
+2012-04-18 Jer Noble <jer.no...@apple.com>
+
+ Lion Production Test failing with error: "Failed to stop httpd: pid file still exists"
+ https://bugs.webkit.org/show_bug.cgi?id=84177
+
+ Reviewed by Dirk Pranke.
+
+ Try to delete the pid file left by Apache in the case it was killed forcefully.
+
+ * Scripts/webkitpy/layout_tests/servers/apache_http_server.py:
+ (LayoutTestApacheHttpd._stop_running_server):
+
2012-04-18 Allan Sandfeld Jensen <allan.jen...@nokia.com>
Clean-up WheelEvent Conversion.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py (114554 => 114555)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2012-04-18 20:46:44 UTC (rev 114554)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/apache_http_server.py 2012-04-18 20:47:54 UTC (rev 114555)
@@ -137,6 +137,12 @@
return int(self._filesystem.read_text_file(self._pid_file))
def _stop_running_server(self):
+ # If apache was forcefully killed, the pid file will not have been deleted, so check
+ # that the process specified by the pid_file no longer exists before deleting the file.
+ if self._pid and not self._executive.check_running_pid(self._pid):
+ self._filesystem.remove(self._pid_file)
+ return
+
retval, err = self._run(self._stop_cmd)
if retval or len(err):
raise http_server_base.ServerError('Failed to stop %s: %s' % (self._name, err))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
