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

Add adblock import directory unit test

Browse Source
This commit is contained in:
zaowen 2018-09-05 20:55:22 -05:00 committed by zaowen
parent bdc41db601
commit c4cca4755e
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
qutebrowser/browser/adblock.py
View File

@ -178,7 +178,6 @@ class HostBlocker:
for filenames in os.scandir(filename): for filenames in os.scandir(filename):
if not filenames.name.startswith('.')\ if not filenames.name.startswith('.')\
and filenames.is_file(): and filenames.is_file():
print( filenames.name )
self._import_local(filenames.path) self._import_local(filenames.path)
else: else:
self._import_local(filename) self._import_local(filename)

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

@ -433,3 +433,22 @@ def test_config_change(config_stub, basedir, download_stub,
host_blocker.read_hosts() host_blocker.read_hosts()
for str_url in URLS_TO_CHECK: for str_url in URLS_TO_CHECK:
assert not host_blocker.is_blocked(QUrl(str_url)) assert not host_blocker.is_blocked(QUrl(str_url))
def test_add_directory(config_stub, basedir, download_stub,
data_tmpdir, tmpdir):
"""Ensure adblocker can import all files in a directory."""
blocklist_hosts2 = []
for i in BLOCKLIST_HOSTS[1:]:
blocklist_hosts2.append('1' + i)
create_blocklist(tmpdir, blocked_hosts=BLOCKLIST_HOSTS,
name='blocked-hosts', line_format='one_per_line')
create_blocklist(tmpdir, blocked_hosts=blocklist_hosts2,
name='blocked-hosts2', line_format='one_per_line')
config_stub.val.content.host_blocking.lists = [tmpdir.strpath]
config_stub.val.content.host_blocking.enabled = True
host_blocker = adblock.HostBlocker()
host_blocker.adblock_update()
assert len(host_blocker._blocked_hosts) == (len(blocklist_hosts2) * 2)