diff --git a/tests/test_frontier.py b/tests/test_frontier.py index 9b80a4f..669f0ec 100644 --- a/tests/test_frontier.py +++ b/tests/test_frontier.py @@ -73,9 +73,7 @@ def test_basics(): 'job_id': job.id, 'last_claimed': brozzler.EPOCH_UTC, 'last_disclaimed': brozzler.EPOCH_UTC, - 'scope': { - 'surt': 'http://(com,example,)/' - }, + 'scope': {'accepts': [{'ssurt': b'com,example,//http:/'}]}, 'seed': 'http://example.com', 'starts_and_stops': [ { @@ -91,9 +89,7 @@ def test_basics(): 'job_id': job.id, 'last_claimed': brozzler.EPOCH_UTC, 'last_disclaimed': brozzler.EPOCH_UTC, - 'scope': { - 'surt': 'https://(org,example,)/', - }, + 'scope': {'accepts': [{'ssurt': b'org,example,//https:/'}]}, 'seed': 'https://example.org/', 'starts_and_stops': [ { @@ -443,8 +439,7 @@ def test_field_defaults(): brozzler.Site.table_ensure(rr) site = brozzler.Site(rr, {'seed': 'http://example.com/'}) assert site.id is None - assert site.scope - assert site.scope['surt'] == 'http://(com,example,)/' + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/'}]} site.save() assert site.id assert site.scope @@ -638,11 +633,15 @@ def test_completed_page(): 'hops_from_seed': 0, 'redirect_url':'http://example.com/b/', }) page.save() - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} frontier.completed_page(site, page) - assert site.scope == {'surt': 'http://(com,example,)/b/'} + assert site.scope == {'accepts': [ + {'ssurt': b'com,example,//http:/a/'}, + {'ssurt': b'com,example,//http:/b/'}]} site.refresh() - assert site.scope == {'surt': 'http://(com,example,)/b/'} + assert site.scope == {'accepts': [ + {'ssurt': b'com,example,//http:/a/'}, + {'ssurt': b'com,example,//http:/b/'}]} assert page.brozzle_count == 1 assert page.claimed == False page.refresh() @@ -661,11 +660,11 @@ def test_completed_page(): 'hops_from_seed': 0, 'redirect_url':'http://example.com/a/x/', }) page.save() - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} frontier.completed_page(site, page) - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} site.refresh() - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} assert page.brozzle_count == 1 assert page.claimed == False page.refresh() @@ -683,11 +682,11 @@ def test_completed_page(): 'hops_from_seed': 1, 'redirect_url':'http://example.com/d/', }) page.save() - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} frontier.completed_page(site, page) - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} site.refresh() - assert site.scope == {'surt': 'http://(com,example,)/a/'} + assert site.scope == {'accepts': [{'ssurt': b'com,example,//http:/a/'}]} assert page.brozzle_count == 1 assert page.claimed == False page.refresh() @@ -727,7 +726,7 @@ def test_hashtag_seed(): site = brozzler.Site(rr, {'seed': 'http://example.org/'}) brozzler.new_site(frontier, site) - assert site.scope['surt'] == 'http://(org,example,)/' + assert site.scope == {'accepts': [{'ssurt': b'org,example,//http:/'}]} pages = list(frontier.site_pages(site.id)) assert len(pages) == 1 @@ -738,7 +737,7 @@ def test_hashtag_seed(): site = brozzler.Site(rr, {'seed': 'http://example.org/#hash'}) brozzler.new_site(frontier, site) - assert site.scope['surt'] == 'http://(org,example,)/' + assert site.scope == {'accepts': [{'ssurt': b'org,example,//http:/'}]} pages = list(frontier.site_pages(site.id)) assert len(pages) == 1