RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

close pool connections before finishing tests

This commit is contained in:
Daniel Graña 2012-05-16 10:31:03 -03:00
parent b34606030d
commit db232da068
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scrapy/core/downloader/handlers/http11.py
View File

@ -35,6 +35,9 @@ class Http11DownloadHandler(object):
agent = ScrapyAgent(contextFactory=self._contextFactory, pool=self._pool)
return agent.download_request(request)
def close(self):
return self._pool.closeCachedConnections()
class ScrapyAgent(object):

30
scrapy/tests/test_downloader_handlers.py
View File

@ -47,6 +47,8 @@ class FileTestCase(unittest.TestCase):
class HttpTestCase(unittest.TestCase):
download_handler_cls = HttpDownloadHandler
def setUp(self):
name = self.mktemp()
os.mkdir(name)
@ -62,10 +64,14 @@ class HttpTestCase(unittest.TestCase):
self.wrapper = WrappingFactory(self.site)
self.port = reactor.listenTCP(0, self.wrapper, interface='127.0.0.1')
self.portno = self.port.getHost().port
self.download_request = HttpDownloadHandler(Settings()).download_request
self.download_handler = self.download_handler_cls(Settings())
self.download_request = self.download_handler.download_request
@defer.inlineCallbacks
def tearDown(self):
return self.port.stopListening()
yield self.port.stopListening()
if hasattr(self.download_handler, 'close'):
yield self.download_handler.close()
def getURL(self, path):
return "http://127.0.0.1:%d/%s" % (self.portno, path)
@ -134,9 +140,9 @@ class HttpTestCase(unittest.TestCase):
class Http11TestCase(HttpTestCase):
def setUp(self):
HttpTestCase.setUp(self)
self.download_request = Http11DownloadHandler().download_request
"""HTTP 1.1 test case"""
download_handler_cls = Http11DownloadHandler
class UriResource(resource.Resource):
"""Return the full uri that was requested"""
@ -150,15 +156,21 @@ class UriResource(resource.Resource):
class HttpProxyTestCase(unittest.TestCase):
download_handler_cls = HttpDownloadHandler
def setUp(self):
site = server.Site(UriResource(), timeout=None)
wrapper = WrappingFactory(site)
self.port = reactor.listenTCP(0, wrapper, interface='127.0.0.1')
self.portno = self.port.getHost().port
self.download_request = HttpDownloadHandler(Settings()).download_request
self.download_handler = self.download_handler_cls(Settings())
self.download_request = self.download_handler.download_request
@defer.inlineCallbacks
def tearDown(self):
return self.port.stopListening()
yield self.port.stopListening()
if hasattr(self.download_handler, 'close'):
yield self.download_handler.close()
def getURL(self, path):
return "http://127.0.0.1:%d/%s" % (self.portno, path)
@ -184,9 +196,7 @@ class HttpProxyTestCase(unittest.TestCase):
class Http11ProxyTestCase(HttpProxyTestCase):
def setUp(self):
HttpProxyTestCase.setUp(self)
self.download_request = Http11DownloadHandler().download_request
download_handler_cls = Http11DownloadHandler
class HttpDownloadHandlerMock(object):