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

fixed wrong code in test

This commit is contained in:
Pablo Hoffman 2011-06-10 18:27:39 -03:00
parent c4a607fc78
commit 37830da1f6
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scrapy/tests/test_downloadermiddleware_stats.py
View File

@ -14,7 +14,7 @@ class TestDownloaderStats(TestCase):
stats.open_spider(self.spider)
self.req = Request('scrapytest.org')
self.req = Request('http://scrapytest.org')
self.res = Response('scrapytest.org', status=400)
def test_process_request(self):

2
scrapy/tests/test_http_request.py
View File

@ -142,7 +142,7 @@ class RequestTest(unittest.TestCase):
class CustomRequest(self.request_class):
pass
r1 = CustomRequest('example.com', 'http://www.example.com')
r1 = CustomRequest('http://www.example.com')
r2 = r1.copy()
assert type(r2) is CustomRequest

40
scrapy/tests/test_pipeline_media.py
View File

@ -36,7 +36,7 @@ class BaseMediaPipelineTestCase(unittest.TestCase):
self.pipe.close_spider(self.spider)
def test_default_media_to_download(self):
request = Request('url')
request = Request('http://url')
assert self.pipe.media_to_download(request, self.info) is None
def test_default_get_media_requests(self):
@ -44,12 +44,12 @@ class BaseMediaPipelineTestCase(unittest.TestCase):
assert self.pipe.get_media_requests(item, self.info) is None
def test_default_media_downloaded(self):
request = Request('url')
response = Response('url', body='')
request = Request('http://url')
response = Response('http://url', body='')
assert self.pipe.media_downloaded(response, request, self.info) is response
def test_default_media_failed(self):
request = Request('url')
request = Request('http://url')
fail = Failure(Exception())
assert self.pipe.media_failed(fail, request, self.info) is fail
@ -132,8 +132,8 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
def test_result_succeed(self):
cb = lambda _: self.pipe._mockcalled.append('request_callback') or _
eb = lambda _: self.pipe._mockcalled.append('request_errback') or _
rsp = Response('url1')
req = Request('url1', meta=dict(response=rsp), callback=cb, errback=eb)
rsp = Response('http://url1')
req = Request('http://url1', meta=dict(response=rsp), callback=cb, errback=eb)
item = dict(requests=req)
new_item = yield self.pipe.process_item(item, self.spider)
self.assertEqual(new_item['results'], [(True, rsp)])
@ -147,7 +147,7 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
cb = lambda _: self.pipe._mockcalled.append('request_callback') or _
eb = lambda _: self.pipe._mockcalled.append('request_errback') or _
fail = Failure(Exception())
req = Request('url1', meta=dict(response=fail), callback=cb, errback=eb)
req = Request('http://url1', meta=dict(response=fail), callback=cb, errback=eb)
item = dict(requests=req)
new_item = yield self.pipe.process_item(item, self.spider)
self.assertEqual(new_item['results'], [(False, fail)])
@ -158,10 +158,10 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
@inlineCallbacks
def test_mix_of_success_and_failure(self):
self.pipe.LOG_FAILED_RESULTS = False
rsp1 = Response('url1')
req1 = Request('url1', meta=dict(response=rsp1))
rsp1 = Response('http://url1')
req1 = Request('http://url1', meta=dict(response=rsp1))
fail = Failure(Exception())
req2 = Request('url2', meta=dict(response=fail))
req2 = Request('http://url2', meta=dict(response=fail))
item = dict(requests=[req1, req2])
new_item = yield self.pipe.process_item(item, self.spider)
self.assertEqual(new_item['results'], [(True, rsp1), (False, fail)])
@ -180,15 +180,15 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
@inlineCallbacks
def test_get_media_requests(self):
# returns single Request (without callback)
req = Request('url')
req = Request('http://url')
item = dict(requests=req) # pass a single item
new_item = yield self.pipe.process_item(item, self.spider)
assert new_item is item
assert request_fingerprint(req) in self.info.downloaded
# returns iterable of Requests
req1 = Request('url1')
req2 = Request('url2')
req1 = Request('http://url1')
req2 = Request('http://url2')
item = dict(requests=iter([req1, req2]))
new_item = yield self.pipe.process_item(item, self.spider)
assert new_item is item
@ -197,8 +197,8 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
@inlineCallbacks
def test_results_are_cached_across_multiple_items(self):
rsp1 = Response('url1')
req1 = Request('url1', meta=dict(response=rsp1))
rsp1 = Response('http://url1')
req1 = Request('http://url1', meta=dict(response=rsp1))
item = dict(requests=req1)
new_item = yield self.pipe.process_item(item, self.spider)
self.assertTrue(new_item is item)
@ -214,8 +214,8 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
@inlineCallbacks
def test_results_are_cached_for_requests_of_single_item(self):
rsp1 = Response('url1')
req1 = Request('url1', meta=dict(response=rsp1))
rsp1 = Response('http://url1')
req1 = Request('http://url1', meta=dict(response=rsp1))
req2 = Request(req1.url, meta=dict(response=Response('http://donot.download.me')))
item = dict(requests=[req1, req2])
new_item = yield self.pipe.process_item(item, self.spider)
@ -232,7 +232,7 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
self.assertEqual(len(self.info.waiting[fp]), 2)
return response
rsp1 = Response('url')
rsp1 = Response('http://url')
def rsp1_func():
dfd = Deferred().addCallback(_check_downloading)
reactor.callLater(.1, dfd.callback, rsp1)
@ -241,7 +241,7 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
def rsp2_func():
self.fail('it must cache rsp1 result and must not try to redownload')
req1 = Request('url', meta=dict(response=rsp1_func))
req1 = Request('http://url', meta=dict(response=rsp1_func))
req2 = Request(req1.url, meta=dict(response=rsp2_func))
item = dict(requests=[req1, req2])
new_item = yield self.pipe.process_item(item, self.spider)
@ -249,7 +249,7 @@ class MediaPipelineTestCase(BaseMediaPipelineTestCase):
@inlineCallbacks
def test_use_media_to_download_result(self):
req = Request('url', meta=dict(result='ITSME', response=self.fail))
req = Request('http://url', meta=dict(result='ITSME', response=self.fail))
item = dict(requests=req)
new_item = yield self.pipe.process_item(item, self.spider)
self.assertEqual(new_item['results'], [(True, 'ITSME')])