From 6fd205d579ff53eb846ce5e15e558d4ea0e90823 Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 18 Dec 2013 11:22:30 +0100 Subject: 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 --- tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/auto/network') 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); -- cgit v1.2.3 From f15d73058903eee77daa0a3f6deb8554aa01ea93 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 15 Jan 2014 14:01:08 +0100 Subject: test: tst_qhostinfo requires `private_tests' set Otherwise you get: undefined reference to `qt_qhostinfo_clear_cache()' Change-Id: I32313f290b9e4236440ae01afe12285d4539be60 Reviewed-by: Peter Hartmann --- tests/auto/network/kernel/qhostinfo/qhostinfo.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/network') diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index c21e73ccee..b6f5c2badb 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -3,6 +3,7 @@ TARGET = tst_qhostinfo SOURCES += tst_qhostinfo.cpp +requires(contains(QT_CONFIG,private_tests)) QT = core-private network-private testlib wince*: { -- cgit v1.2.3 From fa907401e90364797b3e60223618b94b4b8776e5 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 15 Jan 2014 14:10:16 +0100 Subject: test: tst_qhttpsocketengine requires `private_tests' set Otherwise you get: undefined reference to `vtable for QAbstractSocketEngine' when -developer-build is not used. Change-Id: I444140736a6bf736894dc12a20f6a4d48af2678e Reviewed-by: Peter Hartmann --- tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/auto/network') diff --git a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro index 414486f82b..009d151e29 100644 --- a/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro +++ b/tests/auto/network/socket/qhttpsocketengine/qhttpsocketengine.pro @@ -7,6 +7,7 @@ include(../platformsocketengine/platformsocketengine.pri) MOC_DIR=tmp +requires(contains(QT_CONFIG,private_tests)) QT = core-private network-private testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 -- cgit v1.2.3 From 7c8131763de9e70ca56f16635716e7e00559b5d1 Mon Sep 17 00:00:00 2001 From: "Richard J. Moore" Date: Sun, 12 Jan 2014 16:59:27 +0000 Subject: Prevent spurious SSL errors from local certificates. Qt since approximately 4.4 has set the verify callback on both the SSL store and the SSL context. Only the latter is actually needed. This is normally not a problem, but openssl prior to 1.0.2 uses the verify code to find the intermediate certificates for any local certificate that has been set which can lead to verification errors for the local certificate to be emitted. Task-number: QTBUG-33228 Task-number: QTBUG-7200 Task-number: QTBUG-24234 Change-Id: Ie4115e7f7faa1267ea9b807c01b1ed6604c4a16c Reviewed-by: Peter Hartmann Reviewed-by: Thiago Macieira --- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/network') diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp index a15daf660a..d19e08178a 100644 --- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp @@ -1924,9 +1924,6 @@ void tst_QSslSocket::verifyMode() loop.exec(); QVERIFY(clientSocket.isEncrypted()); -#if (defined(UBUNTU_ONEIRIC) && defined(__x86_64__)) || defined(Q_OS_WIN) || defined(Q_OS_MAC) - QEXPECT_FAIL("", "QTBUG-24234", Abort); -#endif QVERIFY(server.socket->sslErrors().isEmpty()); } -- cgit v1.2.3