diff options
Diffstat (limited to 'tests/unit/browser/webkit/network/test_networkreply.py')
-rw-r--r-- | tests/unit/browser/webkit/network/test_networkreply.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/tests/unit/browser/webkit/network/test_networkreply.py b/tests/unit/browser/webkit/network/test_networkreply.py index fc400c1b2..27064baa4 100644 --- a/tests/unit/browser/webkit/network/test_networkreply.py +++ b/tests/unit/browser/webkit/network/test_networkreply.py @@ -21,15 +21,13 @@ import pytest -from qutebrowser.qt.core import QUrl, QIODevice -from qutebrowser.qt.network import QNetworkRequest, QNetworkReply - from qutebrowser.browser.webkit.network import networkreply +from qutebrowser.qt import network, core @pytest.fixture def req(): - return QNetworkRequest(QUrl('http://www.qutebrowser.org/')) + return network.QNetworkRequest(core.QUrl('http://www.qutebrowser.org/')) class TestFixedDataNetworkReply: @@ -38,11 +36,11 @@ class TestFixedDataNetworkReply: reply = networkreply.FixedDataNetworkReply(req, b'', 'test/foo') assert reply.request() == req assert reply.url() == req.url() - assert reply.openMode() == QIODevice.OpenModeFlag.ReadOnly - assert reply.header(QNetworkRequest.KnownHeaders.ContentTypeHeader) == 'test/foo' - http_code = reply.attribute(QNetworkRequest.Attribute.HttpStatusCodeAttribute) + assert reply.openMode() == core.QIODevice.OpenModeFlag.ReadOnly + assert reply.header(network.QNetworkRequest.KnownHeaders.ContentTypeHeader) == 'test/foo' + http_code = reply.attribute(network.QNetworkRequest.Attribute.HttpStatusCodeAttribute) http_reason = reply.attribute( - QNetworkRequest.Attribute.HttpReasonPhraseAttribute) + network.QNetworkRequest.Attribute.HttpReasonPhraseAttribute) assert http_code == 200 assert http_reason == 'OK' assert reply.isFinished() @@ -76,7 +74,7 @@ class TestFixedDataNetworkReply: def test_error_network_reply(qtbot, req): reply = networkreply.ErrorNetworkReply( - req, "This is an error", QNetworkReply.NetworkError.UnknownNetworkError) + req, "This is an error", network.QNetworkReply.NetworkError.UnknownNetworkError) with qtbot.wait_signals([reply.errorOccurred, reply.finished], order='strict'): pass @@ -84,18 +82,18 @@ def test_error_network_reply(qtbot, req): reply.abort() # shouldn't do anything assert reply.request() == req assert reply.url() == req.url() - assert reply.openMode() == QIODevice.OpenModeFlag.ReadOnly + assert reply.openMode() == core.QIODevice.OpenModeFlag.ReadOnly assert reply.isFinished() assert not reply.isRunning() assert reply.bytesAvailable() == 0 assert reply.readData(1) == b'' - assert reply.error() == QNetworkReply.NetworkError.UnknownNetworkError + assert reply.error() == network.QNetworkReply.NetworkError.UnknownNetworkError assert reply.errorString() == "This is an error" def test_redirect_network_reply(): - url = QUrl('https://www.example.com/') + url = core.QUrl('https://www.example.com/') reply = networkreply.RedirectNetworkReply(url) assert reply.readData(1) == b'' - assert reply.attribute(QNetworkRequest.Attribute.RedirectionTargetAttribute) == url + assert reply.attribute(network.QNetworkRequest.Attribute.RedirectionTargetAttribute) == url reply.abort() # shouldn't do anything |