from twisted.internet import reactor, defer, protocol
from twisted.internet.protocol import ClientFactory
+from twisted import version as twisted_version
from twisted.web2.client.interfaces import IHTTPClientManager
from twisted.web2.client.http import ProtocolError, ClientRequest, HTTPClientProtocol
+from twisted.web2 import stream as stream_mod, http_headers
+from twisted.web2 import version as web2_version
from twisted.trial import unittest
from zope.interface import implements
+from apt_dht_conf import version
+
class HTTPClientManager(ClientFactory):
"""A manager for all HTTP requests to a single site.
+ Controls all requests that got to a single site (host and port).
+ This includes buffering requests until they can be sent and reconnecting
+ in the even of the connection being closed.
"""
implements(IHTTPClientManager)
- def __init__(self, host, port):
+ def __init__(self, host, port=80):
self.host = host
self.port = port
self.busy = False
if not self.closed:
self.proto.transport.loseConnection()
+ def is_idle(self):
+ return not self.busy and not self.request_queue and not self.response_queue
+
def submitRequest(self, request):
request.deferRequest = defer.Deferred()
self.request_queue.append(request)
self.proto = None
if self.request_queue:
self.processQueue()
-
-class TestDownloader(unittest.TestCase):
+
+ def setCommonHeaders(self):
+ headers = http_headers.Headers()
+ headers.setHeader('Host', self.host)
+ headers.setHeader('User-Agent', 'apt-dht/%s (twisted/%s twisted.web2/%s)' %
+ (version.short(), twisted_version.short(), web2_version.short()))
+ return headers
+
+ def get(self, path, method="GET"):
+ headers = self.setCommonHeaders()
+ return self.submitRequest(ClientRequest(method, path, headers, None))
+
+ def getRange(self, path, rangeStart, rangeEnd, method="GET"):
+ headers = self.setCommonHeaders()
+ headers.setHeader('Range', ('bytes', [(rangeStart, rangeEnd)]))
+ return self.submitRequest(ClientRequest(method, path, headers, None))
+
+class TestClientManager(unittest.TestCase):
+ """Unit tests for the HTTPClientManager."""
client = None
pending_calls = []
def gotResp(self, resp, num, expect):
self.failUnless(resp.code >= 200 and resp.code < 300, "Got a non-200 response: %r" % resp.code)
- self.failUnless(resp.stream.length == expect, "Length was incorrect, got %r, expected %r" % (resp.stream.length, expect))
- resp.stream.close()
+ if expect is not None:
+ self.failUnless(resp.stream.length == expect, "Length was incorrect, got %r, expected %r" % (resp.stream.length, expect))
+ def print_(n):
+ pass
+ def printdone(n):
+ pass
+ stream_mod.readStream(resp.stream, print_).addCallback(printdone)
def test_download(self):
host = 'www.camrdale.org'
self.client = HTTPClientManager(host, 80)
self.timeout = 10
- lastDefer = defer.Deferred()
- d = self.client.submitRequest(ClientRequest("GET", '/robots.txt', {'Host':host}, None))
+ d = self.client.get('/robots.txt')
d.addCallback(self.gotResp, 1, 309)
- d.addBoth(lastDefer.callback)
- return lastDefer
+ return d
def test_head(self):
host = 'www.camrdale.org'
self.client = HTTPClientManager(host, 80)
self.timeout = 10
- lastDefer = defer.Deferred()
- d = self.client.submitRequest(ClientRequest("HEAD", '/robots.txt', {'Host':host}, None))
+ d = self.client.get('/robots.txt', "HEAD")
d.addCallback(self.gotResp, 1, 0)
- d.addBoth(lastDefer.callback)
- return lastDefer
+ return d
def test_multiple_downloads(self):
host = 'www.camrdale.org'
lastDefer = defer.Deferred()
def newRequest(path, num, expect, last=False):
- d = self.client.submitRequest(ClientRequest("GET", path, {'Host':host}, None))
+ d = self.client.get(path)
d.addCallback(self.gotResp, num, expect)
if last:
d.addCallback(lastDefer.callback)
self.pending_calls.append(reactor.callLater(62, newRequest, '/sitemap2.rss', 0, 302362, True))
return lastDefer
+ def test_multiple_quick_downloads(self):
+ host = 'www.camrdale.org'
+ self.client = HTTPClientManager(host, 80)
+ self.timeout = 30
+ lastDefer = defer.Deferred()
+
+ def newRequest(path, num, expect, last=False):
+ d = self.client.get(path)
+ d.addCallback(self.gotResp, num, expect)
+ if last:
+ d.addCallback(lastDefer.callback)
+
+ newRequest("/", 1, 3433)
+ newRequest("/blog/", 2, 37121)
+ newRequest("/camrdale.html", 3, 2234)
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/robots.txt', 4, 309))
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/wikilink.html', 5, 3084))
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/sitemap.html', 6, 4750))
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/PlanetLab.html', 7, 2783))
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/openid.html', 8, 2525))
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/subpage.html', 9, 2381))
+ self.pending_calls.append(reactor.callLater(0, newRequest, '/sitemap2.rss', 0, 302362, True))
+ return lastDefer
+
def test_range(self):
host = 'www.camrdale.org'
self.client = HTTPClientManager(host, 80)
self.timeout = 10
- lastDefer = defer.Deferred()
- d = self.client.submitRequest(ClientRequest("GET", '/robots.txt', {'Host':host, 'Range': ('bytes', [(100, 199)])}, None))
+ d = self.client.getRange('/robots.txt', 100, 199)
d.addCallback(self.gotResp, 1, 100)
- d.addBoth(lastDefer.callback)
- return lastDefer
+ return d
def tearDown(self):
for p in self.pending_calls:
projects / quix0rs-apt-p2p.git / blobdiff