diff options
author | Markus Goetz <markus@woboq.com> | 2021-06-07 16:56:59 +0200 |
---|---|---|
committer | Markus Goetz <markus@woboq.com> | 2021-07-20 22:08:39 +0200 |
commit | e1b010ff47ae81067802d9240ea990d6d9187484 (patch) | |
tree | 612acc4acf7585aec439262326442b1a993ad168 /tests/auto/network/access/qnetworkreply | |
parent | 5e688a72046972b871347ff4d8dd141cdf9f2cef (diff) |
QNetworkReply: Add two new signals
These signals allow monitoring where in the HTTP1/HTTP2
flow a request is currently in.
Fixes: QTBUG-71698
Fixes: QTBUG-18766
Change-Id: Icc2fe435afc9f680fa7a76c32731e25fcdfeb4b4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'tests/auto/network/access/qnetworkreply')
-rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index ccc70cfff4..308b2a70d1 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -507,6 +507,9 @@ private Q_SLOTS: void getWithTimeout(); void postWithTimeout(); + void moreActivitySignals_data(); + void moreActivitySignals(); + void contentEncoding_data(); void contentEncoding(); void contentEncodingBigPayload_data(); @@ -9370,6 +9373,58 @@ void tst_QNetworkReply::postWithTimeout() manager.setTransferTimeout(0); } +void tst_QNetworkReply::moreActivitySignals_data() +{ + QTest::addColumn<QUrl>("url"); + QTest::addColumn<bool>("useipv6"); + QTest::addRow("local4") << QUrl("http://127.0.0.1") << false; + QTest::addRow("local6") << QUrl("http://[::1]") << true; + if (qEnvironmentVariable("QTEST_ENVIRONMENT").split(' ').contains("ci")) { + // On CI server + QTest::addRow("localDns") << QUrl("http://localhost") << false; // will find v6 + } else { + // For manual testing + QTest::addRow("localDns4") << QUrl("http://localhost") << true; // will find both v4 and v6 + QTest::addRow("localDns6") << QUrl("http://localhost") << false; // will find both v4 and v6 + } +} + +void tst_QNetworkReply::moreActivitySignals() +{ + QFETCH(QUrl, url); + QFETCH(bool, useipv6); + MiniHttpServer server(tst_QNetworkReply::httpEmpty200Response, false, nullptr/*thread*/, useipv6); + server.doClose = false; + url.setPort(server.serverPort()); + QNetworkRequest request(url); + QNetworkReplyPtr reply(manager.get(request)); + QSignalSpy spy1(reply.data(), SIGNAL(socketConnecting())); + QSignalSpy spy2(reply.data(), SIGNAL(requestSent())); + QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged())); + QSignalSpy spy4(reply.data(), SIGNAL(finished())); + spy1.wait(); + QCOMPARE(spy1.count(), 1); + spy2.wait(); + QCOMPARE(spy2.count(), 1); + spy3.wait(); + QCOMPARE(spy3.count(), 1); + spy4.wait(); + QCOMPARE(spy4.count(), 1); + QVERIFY(reply->error() == QNetworkReply::NoError); + // Second request will not send socketConnecting because of keep-alive, so don't check it. + QNetworkReplyPtr secondreply(manager.get(request)); + QSignalSpy secondspy2(secondreply.data(), SIGNAL(requestSent())); + QSignalSpy secondspy3(secondreply.data(), SIGNAL(metaDataChanged())); + QSignalSpy secondspy4(secondreply.data(), SIGNAL(finished())); + secondspy2.wait(); + QCOMPARE(secondspy2.count(), 1); + secondspy3.wait(); + QCOMPARE(secondspy3.count(), 1); + secondspy4.wait(); + QCOMPARE(secondspy4.count(), 1); + QVERIFY(secondreply->error() == QNetworkReply::NoError); +} + void tst_QNetworkReply::contentEncoding_data() { QTest::addColumn<QByteArray>("encoding"); |