diff options
| author | Peter Hartmann <phartmann@blackberry.com> | 2013-12-18 11:22:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-10 17:14:29 +0100 |
| commit | 6fd205d579ff53eb846ce5e15e558d4ea0e90823 (patch) | |
| tree | c61dc5dd4d620f70f75281e22afebf51d0377567 | |
| parent | 2dc04430baf4c38f3ee8b855236bbb1e3d60e946 (diff) | |
| download | qtbase-6fd205d579ff53eb846ce5e15e558d4ea0e90823.tar.gz qtbase-6fd205d579ff53eb846ce5e15e558d4ea0e90823.tar.bz2 qtbase-6fd205d579ff53eb846ce5e15e558d4ea0e90823.zip | |
network proxy tests: adapt proxy authentication to new server
The tests pass with the new test server image. Once we are using the
new test server we can remove the test for the host not found error.
Change-Id: Iac8ba6d8ce31b0865b33a003086aac0339afe338
Reviewed-by: Richard J. Moore <rich@kde.org>
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index 1837e8d665..291b368e47 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -6596,9 +6596,8 @@ void tst_QNetworkReply::authenticationCacheAfterCancel() QTestEventLoop::instance().enterLoop(10); QVERIFY(!QTestEventLoop::instance().timeout()); - QEXPECT_FAIL("http+socksauth", "QTBUG-23136 - danted accepts bad authentication but blocks the connection", Continue); - QEXPECT_FAIL("https+socksauth", "QTBUG-23136 - danted accepts bad authentication but blocks the connection", Continue); - + if (reply->error() == QNetworkReply::HostNotFoundError) + QSKIP("skip because of quirk in the old test server"); QCOMPARE(reply->error(), QNetworkReply::ProxyAuthenticationRequiredError); QCOMPARE(authSpy.count(), 0); QVERIFY(proxyAuthSpy.count() > 0); |