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

Reformat dicts

Browse Source
This commit is contained in:
Florian Bruhin 2016-05-07 22:34:30 +02:00
parent 1a03388fb5
commit f4f329714d
1 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,9 +241,12 @@ def test_without_datadir(config_stub, tmpdir, monkeypatch, win_registry):
Ensure CommandError is raised and no URL is blocked. Ensure CommandError is raised and no URL is blocked.
""" """
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': generic_blocklists(tmpdir), 'content': {
'host-blocking-enabled': True}} 'host-block-lists': generic_blocklists(tmpdir),
'host-blocking-enabled': True
}
}
monkeypatch.setattr('qutebrowser.utils.standarddir.data', lambda: None) monkeypatch.setattr('qutebrowser.utils.standarddir.data', lambda: None)
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
with pytest.raises(cmdexc.CommandError): with pytest.raises(cmdexc.CommandError):
@ -256,9 +259,12 @@ def test_without_datadir(config_stub, tmpdir, monkeypatch, win_registry):
def test_disabled_blocking_update(basedir, config_stub, download_stub, def test_disabled_blocking_update(basedir, config_stub, download_stub,
data_tmpdir, tmpdir, win_registry): data_tmpdir, tmpdir, win_registry):
"""Ensure no Url is blocked when host blocking is disabled.""" """Ensure no Url is blocked when host blocking is disabled."""
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': generic_blocklists(tmpdir), 'content': {
'host-blocking-enabled': False}} 'host-block-lists': generic_blocklists(tmpdir),
'host-blocking-enabled': False
}
}
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
host_blocker.adblock_update(0) host_blocker.adblock_update(0)
while host_blocker._in_progress: while host_blocker._in_progress:
@ -272,9 +278,12 @@ def test_disabled_blocking_update(basedir, config_stub, download_stub,
def test_no_blocklist_update(config_stub, download_stub, def test_no_blocklist_update(config_stub, download_stub,
data_tmpdir, basedir, tmpdir, win_registry): data_tmpdir, basedir, tmpdir, win_registry):
"""Ensure no URL is blocked when no block list exists.""" """Ensure no URL is blocked when no block list exists."""
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': None, 'content': {
'host-blocking-enabled': True}} 'host-block-lists': None,
'host-blocking-enabled': True
}
}
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
host_blocker.adblock_update(0) host_blocker.adblock_update(0)
host_blocker.read_hosts() host_blocker.read_hosts()
@ -285,10 +294,13 @@ def test_no_blocklist_update(config_stub, download_stub,
def test_successful_update(config_stub, basedir, download_stub, def test_successful_update(config_stub, basedir, download_stub,
data_tmpdir, tmpdir, win_registry): data_tmpdir, tmpdir, win_registry):
"""Ensure hosts from host-block-lists are blocked after an update.""" """Ensure hosts from host-block-lists are blocked after an update."""
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': generic_blocklists(tmpdir), 'content': {
'host-block-lists': generic_blocklists(tmpdir),
'host-blocking-enabled': True, 'host-blocking-enabled': True,
'host-blocking-whitelist': None}} 'host-blocking-whitelist': None
}
}
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
host_blocker.adblock_update(0) host_blocker.adblock_update(0)
# Simulate download is finished # Simulate download is finished
@ -310,10 +322,13 @@ def test_failed_dl_update(config_stub, basedir, download_stub,
name='download_will_fail', name='download_will_fail',
line_format='one_per_line')) line_format='one_per_line'))
hosts_to_block = generic_blocklists(tmpdir) + [dl_fail_blocklist] hosts_to_block = generic_blocklists(tmpdir) + [dl_fail_blocklist]
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': hosts_to_block, 'content': {
'host-block-lists': hosts_to_block,
'host-blocking-enabled': True, 'host-blocking-enabled': True,
'host-blocking-whitelist': None}} 'host-blocking-whitelist': None
}
}
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
host_blocker.adblock_update(0) host_blocker.adblock_update(0)
while host_blocker._in_progress: while host_blocker._in_progress:
@ -337,10 +352,13 @@ def test_blocking_with_whitelist(config_stub, basedir, download_stub,
blocked_hosts=filtered_blocked_hosts, blocked_hosts=filtered_blocked_hosts,
name='blocked-hosts', name='blocked-hosts',
line_format='one_per_line') line_format='one_per_line')
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': [blocklist], 'content': {
'host-block-lists': [blocklist],
'host-blocking-enabled': True, 'host-blocking-enabled': True,
'host-blocking-whitelist': WHITELISTED_HOSTS}} 'host-blocking-whitelist': WHITELISTED_HOSTS
}
}
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
host_blocker.read_hosts() host_blocker.read_hosts()
assert_urls(host_blocker) assert_urls(host_blocker)
@ -371,10 +389,13 @@ def test_config_change(config_stub, basedir, download_stub,
blocked_hosts=filtered_blocked_hosts, blocked_hosts=filtered_blocked_hosts,
name='blocked-hosts', name='blocked-hosts',
line_format='one_per_line')) line_format='one_per_line'))
config_stub.data = {'content': config_stub.data = {
{'host-block-lists': [blocklist], 'content': {
'host-block-lists': [blocklist],
'host-blocking-enabled': True, 'host-blocking-enabled': True,
'host-blocking-whitelist': None}} 'host-blocking-whitelist': None
}
}
host_blocker = adblock.HostBlocker() host_blocker = adblock.HostBlocker()
host_blocker.read_hosts() host_blocker.read_hosts()
config_stub.set('content', 'host-block-lists', None) config_stub.set('content', 'host-block-lists', None)