Merge pull request #118 from nlevitt/urlcanon-surt-fix

account for surt fix in urlcanon 0.3.0
This commit is contained in:
Noah Levitt 2019-03-21 13:48:29 -07:00 committed by GitHub
commit a291de086d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -26,7 +26,7 @@ import setuptools
deps = [ deps = [
'certauth==1.1.6', 'certauth==1.1.6',
'warctools>=4.10.0', 'warctools>=4.10.0',
'urlcanon>=0.1.dev16', 'urlcanon>=0.3.0',
'doublethink>=0.2.0.dev87', 'doublethink>=0.2.0.dev87',
'urllib3>=1.14', 'urllib3>=1.14',
'requests>=2.0.1', 'requests>=2.0.1',

View File

@ -965,12 +965,12 @@ def test_block_rules(http_daemon, https_daemon, warcprox_, archiving_proxies):
}, },
{ {
"url_match": "SURT_MATCH", "url_match": "SURT_MATCH",
"value": "http://(localhost:%s,)/fuh/" % (http_daemon.server_port), "value": "http://(localhost,:%s)/fuh/" % (http_daemon.server_port),
}, },
{ {
"url_match": "SURT_MATCH", "url_match": "SURT_MATCH",
# this rule won't match because of http scheme, https port # this rule won't match because of http scheme, https port
"value": "http://(localhost:%s,)/fuh/" % (https_daemon.server_port), "value": "http://(localhost,:%s)/fuh/" % (https_daemon.server_port),
}, },
{ {
"domain": "bad.domain.com", "domain": "bad.domain.com",