diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/browser/webkit/http/test_content_disposition.py | 10 | ||||
| -rw-r--r-- | tests/unit/browser/webkit/http/test_httpheaders.py (renamed from tests/unit/browser/webkit/http/test_http.py) | 20 |
2 files changed, 15 insertions, 15 deletions
diff --git a/tests/unit/browser/webkit/http/test_content_disposition.py b/tests/unit/browser/webkit/http/test_content_disposition.py index 7cf80e3fd..4f3ef13c7 100644 --- a/tests/unit/browser/webkit/http/test_content_disposition.py +++ b/tests/unit/browser/webkit/http/test_content_disposition.py @@ -6,7 +6,7 @@ import logging import pytest -from qutebrowser.browser.webkit import http +from qutebrowser.browser.webkit import httpheaders DEFAULT_NAME = 'qutebrowser-download' @@ -30,7 +30,7 @@ class HeaderChecker: """Check if the passed header has the given filename.""" reply = self.stubs.FakeNetworkReply( headers={'Content-Disposition': header}) - cd_inline, cd_filename = http.parse_content_disposition(reply) + cd_inline, cd_filename = httpheaders.parse_content_disposition(reply) assert cd_filename is not None assert cd_filename == filename assert cd_inline == expected_inline @@ -40,7 +40,7 @@ class HeaderChecker: reply = self.stubs.FakeNetworkReply( headers={'Content-Disposition': header}) with self.caplog.at_level(logging.ERROR, 'network'): - cd_inline, cd_filename = http.parse_content_disposition(reply) + cd_inline, cd_filename = httpheaders.parse_content_disposition(reply) assert cd_filename == DEFAULT_NAME assert cd_inline @@ -48,7 +48,7 @@ class HeaderChecker: """Check if the passed header results in an unnamed attachment.""" reply = self.stubs.FakeNetworkReply( headers={'Content-Disposition': header}) - cd_inline, cd_filename = http.parse_content_disposition(reply) + cd_inline, cd_filename = httpheaders.parse_content_disposition(reply) assert cd_filename == DEFAULT_NAME assert not cd_inline @@ -164,7 +164,7 @@ class TestAttachment: """ reply = stubs.FakeNetworkReply( headers={'Content-Disposition': 'attachment'}) - cd_inline, cd_filename = http.parse_content_disposition(reply) + cd_inline, cd_filename = httpheaders.parse_content_disposition(reply) assert not cd_inline assert cd_filename == DEFAULT_NAME diff --git a/tests/unit/browser/webkit/http/test_http.py b/tests/unit/browser/webkit/http/test_httpheaders.py index 210d79486..7368575e8 100644 --- a/tests/unit/browser/webkit/http/test_http.py +++ b/tests/unit/browser/webkit/http/test_httpheaders.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -"""Tests for qutebrowser.browser.webkit.http.""" +"""Tests for qutebrowser.browser.webkit.httpheaders.""" import logging @@ -11,7 +11,7 @@ import hypothesis from hypothesis import strategies from qutebrowser.qt.core import QUrl -from qutebrowser.browser.webkit import http +from qutebrowser.browser.webkit import httpheaders @pytest.mark.parametrize('url, expected', [ @@ -24,7 +24,7 @@ from qutebrowser.browser.webkit import http ]) def test_no_content_disposition(stubs, url, expected): reply = stubs.FakeNetworkReply(url=QUrl(url)) - inline, filename = http.parse_content_disposition(reply) + inline, filename = httpheaders.parse_content_disposition(reply) assert inline assert filename == expected @@ -40,8 +40,8 @@ def test_no_content_disposition(stubs, url, expected): # dropping QtWebKit. ]) def test_parse_content_disposition_invalid(value): - with pytest.raises(http.ContentDispositionError): - http.ContentDisposition.parse(value) + with pytest.raises(httpheaders.ContentDispositionError): + httpheaders.ContentDisposition.parse(value) @pytest.mark.parametrize('template', [ @@ -58,16 +58,16 @@ def test_parse_content_disposition_hypothesis(caplog, template, stubs, s): header = template.format(s) reply = stubs.FakeNetworkReply(headers={'Content-Disposition': header}) with caplog.at_level(logging.ERROR, 'network'): - http.parse_content_disposition(reply) + httpheaders.parse_content_disposition(reply) @hypothesis.given(strategies.binary()) def test_content_disposition_directly_hypothesis(s): """Test rfc6266 parsing directly with binary data.""" try: - cd = http.ContentDisposition.parse(s) + cd = httpheaders.ContentDisposition.parse(s) cd.filename() - except http.ContentDispositionError: + except httpheaders.ContentDispositionError: pass @@ -83,7 +83,7 @@ def test_parse_content_type(stubs, content_type, expected_mimetype, reply = stubs.FakeNetworkReply() else: reply = stubs.FakeNetworkReply(headers={'Content-Type': content_type}) - mimetype, rest = http.parse_content_type(reply) + mimetype, rest = httpheaders.parse_content_type(reply) assert mimetype == expected_mimetype assert rest == expected_rest @@ -91,4 +91,4 @@ def test_parse_content_type(stubs, content_type, expected_mimetype, @hypothesis.given(strategies.text()) def test_parse_content_type_hypothesis(stubs, s): reply = stubs.FakeNetworkReply(headers={'Content-Type': s}) - http.parse_content_type(reply) + httpheaders.parse_content_type(reply) |