rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Modify tests, localhost should never be blocked

Browse Source
This commit is contained in:
George Edward Bulmer 2018-03-24 20:15:34 +00:00
parent c8db9e1c76
commit 3f37fcf8fa
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/adblock.py
View File

@ -236,7 +236,7 @@ class HostBlocker:
log.misc.error("Failed to parse: {!r}".format(line))
return False
if '.' not in host and not host.endswith('.localdomain'):
if '.' in host and not host.endswith('.localdomain'):
self._blocked_hosts.add(host)
return True

6
tests/unit/browser/test_adblock.py
View File

@ -114,14 +114,14 @@ def create_blocklist(directory, blocked_hosts=BLOCKLIST_HOSTS,
return name
def assert_urls(host_blocker, blocked=BLOCKLIST_HOSTS,
def assert_urls(host_blocker, blocked=BLOCKLIST_HOSTS[1:],
whitelisted=WHITELISTED_HOSTS, urls_to_check=URLS_TO_CHECK):
"""Test if Urls to check are blocked or not by HostBlocker.
Ensure URLs in 'blocked' and not in 'whitelisted' are blocked.
All other URLs must not be blocked.
"""
whitelisted = list(whitelisted) + list(host_blocker.WHITELISTED)
whitelisted = list(whitelisted)
for str_url in urls_to_check:
url = QUrl(str_url)
host = url.host()
@ -341,7 +341,7 @@ def test_blocking_with_whitelist(config_stub, basedir, download_stub,
"""Ensure hosts in content.host_blocking.whitelist are never blocked."""
# Simulate adblock_update has already been run
# by creating a file named blocked-hosts,
# Exclude localhost from it, since localhost is in HostBlocker.WHITELISTED
# Exclude localhost from it, since localhost is never blocked by list
filtered_blocked_hosts = BLOCKLIST_HOSTS[1:]
blocklist = create_blocklist(data_tmpdir,
blocked_hosts=filtered_blocked_hosts,