summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/http2
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-08 01:00:08 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-08 01:00:08 +0200
commit2b38408cbc23816034f087779d351f4db2ee4b1b (patch)
treec97a6881875331c7ef4b9aecf896434071382a46 /tests/auto/network/access/http2
parent0ea7360eaa70c2b024a37b2ff9106531440cdee7 (diff)
parent36cc171b9314bf77fc84d4273dceb6264aef7134 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13
Diffstat (limited to 'tests/auto/network/access/http2')
-rw-r--r--tests/auto/network/access/http2/BLACKLIST3
-rw-r--r--tests/auto/network/access/http2/tst_http2.cpp3
2 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/network/access/http2/BLACKLIST b/tests/auto/network/access/http2/BLACKLIST
deleted file mode 100644
index 8f26c5b89e..0000000000
--- a/tests/auto/network/access/http2/BLACKLIST
+++ /dev/null
@@ -1,3 +0,0 @@
- See qtbase/src/testlib/qtestblacklist.cpp for format
-[connectToHost]
-*
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index d9fb924872..945ea1b448 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -649,9 +649,6 @@ void tst_Http2::connectToHost()
eventLoop.exitLoop();
QCOMPARE(reply->error(), QNetworkReply::NoError);
QVERIFY(reply->isFinished());
- // Nothing must be sent yet:
- QVERIFY(!prefaceOK);
- QVERIFY(!serverGotSettingsACK);
// Nothing received back:
QVERIFY(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).isNull());
QCOMPARE(reply->readAll().size(), 0);