equal
deleted
inserted
replaced
51 #include <QtNetwork/qtcpserver.h> |
51 #include <QtNetwork/qtcpserver.h> |
52 #include <QtTest/QtTest> |
52 #include <QtTest/QtTest> |
53 |
53 |
54 #include <QNetworkProxy> |
54 #include <QNetworkProxy> |
55 #include <QAuthenticator> |
55 #include <QAuthenticator> |
|
56 |
|
57 #include "private/qhostinfo_p.h" |
56 |
58 |
57 #include "../network-settings.h" |
59 #include "../network-settings.h" |
58 |
60 |
59 Q_DECLARE_METATYPE(QAbstractSocket::SocketState) |
61 Q_DECLARE_METATYPE(QAbstractSocket::SocketState) |
60 Q_DECLARE_METATYPE(QAbstractSocket::SocketError) |
62 Q_DECLARE_METATYPE(QAbstractSocket::SocketError) |
286 proxy = QNetworkProxy(QNetworkProxy::HttpProxy, fluke, 3130); |
288 proxy = QNetworkProxy(QNetworkProxy::HttpProxy, fluke, 3130); |
287 break; |
289 break; |
288 } |
290 } |
289 QNetworkProxy::setApplicationProxy(proxy); |
291 QNetworkProxy::setApplicationProxy(proxy); |
290 } |
292 } |
|
293 |
|
294 qt_qhostinfo_clear_cache(); |
291 } |
295 } |
292 |
296 |
293 void tst_QSslSocket::cleanup() |
297 void tst_QSslSocket::cleanup() |
294 { |
298 { |
295 QNetworkProxy::setApplicationProxy(QNetworkProxy::DefaultProxy); |
299 QNetworkProxy::setApplicationProxy(QNetworkProxy::DefaultProxy); |
475 connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot())); |
479 connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot())); |
476 connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(exitLoop())); |
480 connect(&socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(exitLoop())); |
477 |
481 |
478 // Start connecting |
482 // Start connecting |
479 socket.connectToHost(QtNetworkSettings::serverName(), 993); |
483 socket.connectToHost(QtNetworkSettings::serverName(), 993); |
480 QCOMPARE(socket.state(), QAbstractSocket::HostLookupState); |
484 QVERIFY(socket.state() != QAbstractSocket::UnconnectedState); // something must be in progress |
481 enterLoop(10); |
485 enterLoop(10); |
482 |
486 |
483 // Start handshake |
487 // Start handshake |
484 QCOMPARE(socket.state(), QAbstractSocket::ConnectedState); |
488 QCOMPARE(socket.state(), QAbstractSocket::ConnectedState); |
485 socket.startClientEncryption(); |
489 socket.startClientEncryption(); |