diff options
| author | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-09-02 15:31:53 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@trolltech.com> | 2009-09-02 15:55:12 (GMT) |
| commit | ea6d0580db1cd6e16401a6c197d2b85abd595e2d (patch) | |
| tree | de8b6e4f625851a5bd084da43802424638ee4848 /tests | |
| parent | c9eacfa1c791e2d228a3c8f0c119d02d7f46ee02 (diff) | |
| download | Qt-ea6d0580db1cd6e16401a6c197d2b85abd595e2d.zip Qt-ea6d0580db1cd6e16401a6c197d2b85abd595e2d.tar.gz Qt-ea6d0580db1cd6e16401a6c197d2b85abd595e2d.tar.bz2 | |
QSslSocket autotest: fix failing tests
no issues in code, just in server and test setup
Reviewed-by: trustme
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/network-settings.h | 2 | ||||
| -rw-r--r-- | 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<QSslError>)), this, SLOT(untrustedWorkaroundSlot(QList<QSslError>))); |