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

Split test_is_url into three separate tests

Browse Source
This commit is contained in:
Florian Bruhin 2016-08-23 08:07:45 +02:00
parent 703c4e1973
commit f45c4d73f4
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/unit/utils/test_urlutils.py
View File

@ -346,8 +346,9 @@ def test_get_search_url_invalid(urlutils_config_stub, url):
# autosearch = False # autosearch = False
(False, True, False, 'This is a URL without autosearch'), (False, True, False, 'This is a URL without autosearch'),
]) ])
@pytest.mark.parametrize('auto_search', ['dns', 'naive', False])
def test_is_url(urlutils_config_stub, fake_dns, is_url, is_url_no_autosearch, def test_is_url(urlutils_config_stub, fake_dns, is_url, is_url_no_autosearch,
uses_dns, url): uses_dns, url, auto_search):
"""Test is_url(). """Test is_url().
Args: Args:
@ -357,8 +358,10 @@ def test_is_url(urlutils_config_stub, fake_dns, is_url, is_url_no_autosearch,
uses_dns: Whether the given string should fire a DNS request for the uses_dns: Whether the given string should fire a DNS request for the
given URL. given URL.
url: The URL to test, as a string. url: The URL to test, as a string.
auto_search: With which auto-search setting to test
""" """
urlutils_config_stub.data['general']['auto-search'] = 'dns' urlutils_config_stub.data['general']['auto-search'] = auto_search
if auto_search == 'dns':
if uses_dns: if uses_dns:
fake_dns.answer = True fake_dns.answer = True
result = urlutils.is_url(url) result = urlutils.is_url(url)
@ -374,16 +377,17 @@ def test_is_url(urlutils_config_stub, fake_dns, is_url, is_url_no_autosearch,
result = urlutils.is_url(url) result = urlutils.is_url(url)
assert not fake_dns.used assert not fake_dns.used
assert result == is_url assert result == is_url
elif auto_search == 'naive':
fake_dns.reset()
urlutils_config_stub.data['general']['auto-search'] = 'naive' urlutils_config_stub.data['general']['auto-search'] = 'naive'
assert urlutils.is_url(url) == is_url assert urlutils.is_url(url) == is_url
assert not fake_dns.used assert not fake_dns.used
elif not auto_search:
fake_dns.reset()
urlutils_config_stub.data['general']['auto-search'] = False urlutils_config_stub.data['general']['auto-search'] = False
assert urlutils.is_url(url) == is_url_no_autosearch assert urlutils.is_url(url) == is_url_no_autosearch
assert not fake_dns.used assert not fake_dns.used
else:
raise ValueError("Invalid value {!r} for auto-search!".format(
auto_search))
@pytest.mark.parametrize('user_input, output', [ @pytest.mark.parametrize('user_input, output', [