From ea6d0580db1cd6e16401a6c197d2b85abd595e2d Mon Sep 17 00:00:00 2001 From: Peter Hartmann Date: Wed, 2 Sep 2009 17:31:53 +0200 Subject: QSslSocket autotest: fix failing tests no issues in code, just in server and test setup Reviewed-by: trustme --- tests/auto/network-settings.h | 2 +- tests/auto/qsslsocket/tst_qsslsocket.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index e12d5e9..84f1241 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -181,7 +181,7 @@ public: } #endif QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID AUTH=PLAIN SASL-IR] " ); - expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); + expected = expected.append(QtNetworkSettings::serverName().toAscii()); expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); return expected; } diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp index 86fb9f4..7a6783c 100644 --- a/tests/auto/qsslsocket/tst_qsslsocket.cpp +++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp @@ -592,7 +592,7 @@ void tst_QSslSocket::connectToHostEncrypted() QSslSocketPtr socket = newSocket(); this->socket = socket; - QVERIFY(socket->addCaCertificates(QLatin1String("certs/qt-test-server-cacert.pem"))); + QVERIFY(socket->addCaCertificates(QLatin1String(SRCDIR "certs/qt-test-server-cacert.pem"))); #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND connect(socket, SIGNAL(sslErrors(QList)), this, SLOT(untrustedWorkaroundSlot(QList))); -- cgit v0.12