From c9e48e02c08d374eda29fc25996274d1b5a204e7 Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Fri, 2 Jun 2017 21:42:53 -0700 Subject: [PATCH] fixes from merge --- pywb/warcserver/index/test/test_memento_agg.py | 4 ++-- pywb/warcserver/test/test_upstream.py | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pywb/warcserver/index/test/test_memento_agg.py b/pywb/warcserver/index/test/test_memento_agg.py index 0125106c..a27a6b83 100644 --- a/pywb/warcserver/index/test/test_memento_agg.py +++ b/pywb/warcserver/index/test/test_memento_agg.py @@ -110,7 +110,7 @@ class TestMemAgg(MementoOverrideTests, BaseTestClass): @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): url = 'http://vvork.com/' 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/',)"}) @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): url = 'http://vvork.com/' res, errs = agg(dict(url=url, closest='20141001', limit=2, sources='rhiz,ait')) diff --git a/pywb/warcserver/test/test_upstream.py b/pywb/warcserver/test/test_upstream.py index 1de91710..6b3b689d 100644 --- a/pywb/warcserver/test/test_upstream.py +++ b/pywb/warcserver/test/test_upstream.py @@ -5,10 +5,6 @@ import webtest from io import BytesIO 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 pywb.warcserver.handlers import DefaultResourceHandler