From 5d48143ff8f358b3049279871e9959667e38b9e9 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 29 Aug 2017 11:52:10 -0700 Subject: [PATCH] Autotest: use QUdpSocket instead of QTcpSocket in tst_QNetworkInterface We don't need to bother the network test server with a TCP SYN packet. All we need is for the local operating system to figure out the IP address it would use to send a packet to the test server. We can do that with QUdpSocket. Also, the network test server hasn't been called "fluke.troll.no" for almost a decade. Change-Id: I209fcd5dbc2b4e5381cffffd14df65ccc7133247 Reviewed-by: Timur Pocheptsov --- .../kernel/qnetworkinterface/tst_qnetworkinterface.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index 5695f90c53..e9034deff7 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #ifndef QT_NO_BEARERMANAGEMENT #include #include @@ -189,17 +189,12 @@ void tst_QNetworkInterface::loopbackIPv6() void tst_QNetworkInterface::localAddress() { - QTcpSocket socket; + QUdpSocket socket; socket.connectToHost(QtNetworkSettings::serverName(), 80); QVERIFY(socket.waitForConnected(5000)); QHostAddress local = socket.localAddress(); - // make Apache happy on fluke - socket.write("GET / HTTP/1.0\r\n\r\n"); - socket.waitForBytesWritten(1000); - socket.close(); - // test that we can find the address that QTcpSocket reported QList all = QNetworkInterface::allAddresses(); QVERIFY(all.contains(local));