backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-24 06:59:52 +01:00
Code Issues Projects Releases Activity

responseloader: use PreparedRequest() to ensure url properly formatted

Browse Source 
tests: update tests for latest, live data
This commit is contained in:
Ilya Kreymer 2016-05-24 18:01:44 -07:00
parent 80d9805a58
commit ea3efdf84d
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webagg/responseloader.py
View File

@ -18,7 +18,8 @@ from six.moves.urllib.parse import urlsplit
import uuid import uuid
import six import six
import itertools import itertools
#import requests
from requests.models import PreparedRequest
import urllib3 import urllib3
@ -241,6 +242,10 @@ class LiveWebLoader(BaseLoader):
method = input_req.get_req_method() method = input_req.get_req_method()
data = input_req.get_req_body() data = input_req.get_req_body()
p = PreparedRequest()
p.prepare_url(load_url, None)
load_url = p.url
try: try:
upstream_res = self.pool.urlopen(method=method, upstream_res = self.pool.urlopen(method=method,
url=load_url, url=load_url,

2
webagg/test/live.py
View File

@ -27,7 +27,7 @@ def simpleapp():
'./testdata/' './testdata/'
) )
) )
return app.application return app

2
webagg/test/test_memento_agg.py
View File

@ -63,7 +63,7 @@ def test_mem_agg_index_2(agg):
{"timestamp": "20100511201151", "load_url": "http://wayback.archive-it.org/all/20100511201151id_/http://example.com/", "source": "ait"}, {"timestamp": "20100511201151", "load_url": "http://wayback.archive-it.org/all/20100511201151id_/http://example.com/", "source": "ait"},
{"timestamp": "20100514231857", "load_url": "http://web.archive.org/web/20100514231857id_/http://example.com/", "source": "ia"}, {"timestamp": "20100514231857", "load_url": "http://web.archive.org/web/20100514231857id_/http://example.com/", "source": "ia"},
{"timestamp": "20100514231857", "load_url": "http://wayback.archive-it.org/all/20100514231857id_/http://example.com/", "source": "ait"}, {"timestamp": "20100514231857", "load_url": "http://wayback.archive-it.org/all/20100514231857id_/http://example.com/", "source": "ait"},
{"timestamp": "20100519202418", "load_url": "http://web.archive.org/web/20100519202418id_/http://example.com/", "source": "ia"}] {"timestamp": "20100510233601", "load_url": "http://web.archive.org/web/20100510233601id_/http://example.com/", "source": "ia"}]
assert(to_json_list(res) == exp) assert(to_json_list(res) == exp)
assert(errs == {'rhiz': "NotFoundException('http://webenact.rhizome.org/vvork/http://example.com/',)"}) assert(errs == {'rhiz': "NotFoundException('http://webenact.rhizome.org/vvork/http://example.com/',)"})