Title: [113617] trunk/Tools
- Revision
- 113617
- Author
- [email protected]
- Date
- 2012-04-09 14:07:42 -0700 (Mon, 09 Apr 2012)
Log Message
nrwt is failing to upload test results on the chromium-mac-leopard bots
https://bugs.webkit.org/show_bug.cgi?id=83230
Unreviewed, build fix.
It looks like the change in r113399 to use the per-request
timeout variable didn't actually work, so I am removing the
timeout code altogether and counting on the idea that upload
just isn't likely to take that long and the timeouts and
retransmits are largely unused and largely unnecessary. We'll
see if this breaks anywhere else.
* Scripts/webkitpy/common/net/file_uploader.py:
(FileUploader.__init__):
(FileUploader._upload_data.callback):
(FileUploader):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (113616 => 113617)
--- trunk/Tools/ChangeLog 2012-04-09 20:59:27 UTC (rev 113616)
+++ trunk/Tools/ChangeLog 2012-04-09 21:07:42 UTC (rev 113617)
@@ -1,3 +1,22 @@
+2012-04-09 Dirk Pranke <[email protected]>
+
+ nrwt is failing to upload test results on the chromium-mac-leopard bots
+ https://bugs.webkit.org/show_bug.cgi?id=83230
+
+ Unreviewed, build fix.
+
+ It looks like the change in r113399 to use the per-request
+ timeout variable didn't actually work, so I am removing the
+ timeout code altogether and counting on the idea that upload
+ just isn't likely to take that long and the timeouts and
+ retransmits are largely unused and largely unnecessary. We'll
+ see if this breaks anywhere else.
+
+ * Scripts/webkitpy/common/net/file_uploader.py:
+ (FileUploader.__init__):
+ (FileUploader._upload_data.callback):
+ (FileUploader):
+
2012-04-09 Rob Buis <[email protected]>
[BlackBerry] Cleanup LayoutTestControllerBlackBerry.cpp
Modified: trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py (113616 => 113617)
--- trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py 2012-04-09 20:59:27 UTC (rev 113616)
+++ trunk/Tools/Scripts/webkitpy/common/net/file_uploader.py 2012-04-09 21:07:42 UTC (rev 113617)
@@ -84,7 +84,6 @@
def __init__(self, url, timeout_seconds):
self._url = url
self._timeout_seconds = timeout_seconds
- self._deadline = time.time() + self._timeout_seconds
def upload_single_text_file(self, filesystem, content_type, filename):
return self._upload_data(content_type, filesystem.read_text_file(filename))
@@ -100,11 +99,10 @@
def _upload_data(self, content_type, data):
def callback():
- now = time.time()
- if now > self._deadline:
- # This shouldn't happen, but just to be safe ...
- raise NetworkTimeout()
+ # FIXME: Setting a timeout, either globally using socket.setdefaulttimeout()
+ # or in urlopen(), doesn't appear to work on Mac 10.5 with Python 2.7.
+ # For now we will ignore the timeout value and hope for the best.
request = urllib2.Request(self._url, data, {"Content-Type": content_type})
- return urllib2.urlopen(request, timeout=(self._deadline - now))
+ return urllib2.urlopen(request)
return NetworkTransaction(timeout_seconds=self._timeout_seconds).run(callback)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
