backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

Merge branch 'do_not_archive' into qa

Browse Source
This commit is contained in:
Barbara Miller 2018-02-28 12:31:03 -08:00
commit d87aa0ca57
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_warcprox.py
View File

@ -1427,9 +1427,15 @@ def test_controller_with_defaults():
assert wwp.writer_pool.default_warc_writer.record_builder.digest_algorithm == 'sha1' assert wwp.writer_pool.default_warc_writer.record_builder.digest_algorithm == 'sha1'
<<<<<<< HEAD
class MyEarlyPlugin(warcprox.BaseStandardPostfetchProcessor): class MyEarlyPlugin(warcprox.BaseStandardPostfetchProcessor):
CHAIN_POSITION = 'early' CHAIN_POSITION = 'early'
def _process_put(self): def _process_put(self):
=======
class EarlyPlugin(warcprox.BaseStandardPostfetchProcessor):
CHAIN_POSITION = 'early'
def _process_url(self):
>>>>>>> do_not_archive
pass pass
@ -1438,7 +1444,7 @@ def test_load_plugin():
'warcprox.stats.RunningStats', 'warcprox.stats.RunningStats',
'warcprox.BaseStandardPostfetchProcessor', 'warcprox.BaseStandardPostfetchProcessor',
'warcprox.BaseBatchPostfetchProcessor', 'warcprox.BaseBatchPostfetchProcessor',
'%s.%s' % (__name__, MyEarlyPlugin.__name__),]) '%s.%s' % (__name__, EarlyPlugin.__name__),])
controller = warcprox.controller.WarcproxController(options) controller = warcprox.controller.WarcproxController(options)
assert isinstance( assert isinstance(
controller._postfetch_chain[-1], controller._postfetch_chain[-1],
@ -1462,7 +1468,7 @@ def test_load_plugin():
# MyEarlyPlugin # MyEarlyPlugin
assert isinstance( assert isinstance(
controller._postfetch_chain[0], controller._postfetch_chain[0],
warcprox.BaseStandardPostfetchProcessor) EarlyPlugin)
def test_choose_a_port_for_me(warcprox_): def test_choose_a_port_for_me(warcprox_):
options = warcprox.Options() options = warcprox.Options()