Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 10:44:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for redirection and request objects

Browse Source
This commit is contained in:
Kovid Goyal 2024-08-09 13:12:32 +05:30
parent d7404bcf1b
commit 1c5c36b1d7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/scraper/fetch_backend.py
View File

@ -30,7 +30,7 @@ class RequestInterceptor(QWebEngineUrlRequestInterceptor):
for dr in fb.live_requests:
if dr.url_key == url_key:
for k, v in dr.headers:
req.setHttpHeader(k.encode(), v.encode())
req.setHttpHeader(str(k).encode(), str(v).encode())
def qurl_to_string(url: QUrl | str) -> str:

39
src/calibre/scraper/test_fetch_backend.py
View File

@ -56,6 +56,12 @@ class Handler(http.server.BaseHTTPRequestHandler):
def do_GET(self):
if self.test_obj.dont_send_response:
return
if self.path == '/redirect':
self.send_response(http.HTTPStatus.FOUND)
self.send_header('Location', '/redirected')
self.end_headers()
self.flush_headers()
return
h = {}
for k, v in self.headers.items():
h.setdefault(k, []).append(v)
@ -71,10 +77,10 @@ class Handler(http.server.BaseHTTPRequestHandler):
self.send_header('Content-Length', str(len(data)))
self.send_header('Set-Cookie', 'sc=1')
self.end_headers()
self.flush_headers()
if self.test_obj.dont_send_body:
return
self.wfile.write(data)
self.flush_headers()
else:
self.wfile.write(data)
def log_request(self, code='-', size='-'):
pass
@ -98,13 +104,24 @@ class TestFetchBackend(unittest.TestCase):
self.server_thread.join(5)
def test_recipe_browser(self):
from urllib.error import URLError
from urllib.request import Request
def u(path=''):
return f'http://localhost:{self.port}{path}'
def get(path='', timeout=None):
raw = br.open(u(path), timeout=timeout).read()
return json.loads(raw)
def get(path='', headers=None, timeout=None):
url = u(path)
if headers:
req = Request(url, headers=headers)
else:
req = url
res = br.open(req, timeout=timeout)
raw = res.read()
ans = json.loads(raw)
ans['final_url'] = res.geturl()
return ans
def test_with_timeout(no_response=True):
from urllib.error import URLError
self.dont_send_body = True
if no_response:
self.dont_send_response = True
@ -129,6 +146,14 @@ class TestFetchBackend(unittest.TestCase):
self.ae(r['headers']['Cookie'], ['sc=1'])
test_with_timeout(True)
test_with_timeout(False)
r = get('/redirect')
self.ae(r['path'], '/redirected')
self.ae(r['headers']['th'], ['1'])
self.assertTrue(r['final_url'].endswith('/redirected'))
self.ae(r['headers']['User-Agent'], ['test-ua'])
r = get(headers={'th': '2', 'tc': '1'})
self.ae(r['headers']['Th'], ['2'])
self.ae(r['headers']['Tc'], ['1'])
finally:
br.shutdown()