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

fixes from merge

Browse Source
This commit is contained in:
Ilya Kreymer 2017-06-02 21:42:53 -07:00
parent dbc56b864b
commit c9e48e02c0
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pywb/warcserver/index/test/test_memento_agg.py
View File

@ -110,7 +110,7 @@ class TestMemAgg(MementoOverrideTests, BaseTestClass):
@pytest.mark.parametrize("agg", list(aggs.values()), ids=list(aggs.keys())) @pytest.mark.parametrize("agg", list(aggs.values()), ids=list(aggs.keys()))
@patch('pywb.webagg.indexsource.MementoIndexSource.get_timegate_links', MementoOverrideTests.mock_link_header('agg_test_5')) @patch('pywb.warcserver.index.indexsource.MementoIndexSource.get_timegate_links', MementoOverrideTests.mock_link_header('agg_test_5'))
def test_mem_agg_index_5(self, agg): def test_mem_agg_index_5(self, agg):
url = 'http://vvork.com/' url = 'http://vvork.com/'
res, errs = agg(dict(url=url, closest='20141001', limit=2, sources='!rhiz,ait')) res, errs = agg(dict(url=url, closest='20141001', limit=2, sources='!rhiz,ait'))
@ -122,7 +122,7 @@ class TestMemAgg(MementoOverrideTests, BaseTestClass):
assert(errs == {'bl': "NotFoundException('http://www.webarchive.org.uk/wayback/archive/http://vvork.com/',)"}) assert(errs == {'bl': "NotFoundException('http://www.webarchive.org.uk/wayback/archive/http://vvork.com/',)"})
@pytest.mark.parametrize("agg", list(aggs_inv.values()), ids=list(aggs_inv.keys())) @pytest.mark.parametrize("agg", list(aggs_inv.values()), ids=list(aggs_inv.keys()))
@patch('pywb.webagg.indexsource.MementoIndexSource.get_timegate_links', MementoOverrideTests.mock_link_header('agg_test_5')) @patch('pywb.warcserver.index.indexsource.MementoIndexSource.get_timegate_links', MementoOverrideTests.mock_link_header('agg_test_5'))
def test_mem_agg_index_5_inverse_preset(self, agg): def test_mem_agg_index_5_inverse_preset(self, agg):
url = 'http://vvork.com/' url = 'http://vvork.com/'
res, errs = agg(dict(url=url, closest='20141001', limit=2, sources='rhiz,ait')) res, errs = agg(dict(url=url, closest='20141001', limit=2, sources='rhiz,ait'))

4
pywb/warcserver/test/test_upstream.py
View File

@ -5,10 +5,6 @@ import webtest
from io import BytesIO from io import BytesIO
import requests import requests
from pywb.webagg.handlers import DefaultResourceHandler
from pywb.webagg.aggregator import SimpleAggregator
from pywb.webagg.upstreamindexsource import UpstreamMementoIndexSource, UpstreamAggIndexSource
from warcio.recordloader import ArcWarcRecordLoader from warcio.recordloader import ArcWarcRecordLoader
from pywb.warcserver.handlers import DefaultResourceHandler from pywb.warcserver.handlers import DefaultResourceHandler