Title: [116387] trunk/Tools
- Revision
- 116387
- Author
- [email protected]
- Date
- 2012-05-07 20:05:33 -0700 (Mon, 07 May 2012)
Log Message
[webkitpy] Remove Python 2.5-specific workaround from http_server_base.py.
https://bugs.webkit.org/show_bug.cgi?id=85852
Reviewed by Dirk Pranke.
* Scripts/webkitpy/layout_tests/servers/http_server_base.py:
(HttpServerBase._is_server_running_on_all_ports): Revert the part
of r89412 which was a workaround for an issue with Python 2.5 on
Mac 10.5.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (116386 => 116387)
--- trunk/Tools/ChangeLog 2012-05-08 02:52:57 UTC (rev 116386)
+++ trunk/Tools/ChangeLog 2012-05-08 03:05:33 UTC (rev 116387)
@@ -1,3 +1,15 @@
+2012-05-07 Raphael Kubo da Costa <[email protected]>
+
+ [webkitpy] Remove Python 2.5-specific workaround from http_server_base.py.
+ https://bugs.webkit.org/show_bug.cgi?id=85852
+
+ Reviewed by Dirk Pranke.
+
+ * Scripts/webkitpy/layout_tests/servers/http_server_base.py:
+ (HttpServerBase._is_server_running_on_all_ports): Revert the part
+ of r89412 which was a workaround for an issue with Python 2.5 on
+ Mac 10.5.
+
2012-05-07 Raphael Kubo da Costa <[email protected]>
webkitdirs.pm: Make determineNumberOfCPUs work on FreeBSD.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py (116386 => 116387)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2012-05-08 02:52:57 UTC (rev 116386)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/http_server_base.py 2012-05-08 03:05:33 UTC (rev 116387)
@@ -174,12 +174,6 @@
try:
s.connect(('localhost', port))
_log.debug("Server running on %d" % port)
- except socket.error, e:
- # this branch is needed on Mac 10.5 / python 2.5
- if e.args[0] not in (errno.ECONNREFUSED, errno.ECONNRESET):
- raise
- _log.debug("Server NOT running on %d: %s" % (port, e))
- return False
except IOError, e:
if e.errno not in (errno.ECONNREFUSED, errno.ECONNRESET):
raise
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
