diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-10 20:36:17 -0700 |
---|---|---|
committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-03-16 05:30:44 +0000 |
commit | 97f489e7b9858cd5307cd74fa77774707a62a314 (patch) | |
tree | 99dfcd791d6e475e4d4997852e0d1b5b160bfcfd | |
parent | ba60722b46bc120b149a15eb8a9c6a57d5dbe140 (diff) |
Network tests: don't try to test against disabled network interfaces
Other parts of tst_qudpsocket.cpp already did this check.
Change-Id: Iee8cbc07c4434ce9b560ffff13ca545a03c9596a
Reviewed-by: Richard J. Moore <rich@kde.org>
-rw-r--r-- | tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp | 11 | ||||
-rw-r--r-- | tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp index 6f1a73b054..804f86b479 100644 --- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp +++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp @@ -864,11 +864,12 @@ void tst_QTcpServer::serverAddress_data() QTest::newRow("AnyIPv4") << QHostAddress(QHostAddress::AnyIPv4) << QHostAddress(QHostAddress::AnyIPv4); if (QtNetworkSettings::hasIPv6()) QTest::newRow("AnyIPv6") << QHostAddress(QHostAddress::AnyIPv6) << QHostAddress(QHostAddress::AnyIPv6); - foreach (const QHostAddress& addr, QNetworkInterface::allAddresses()) { - if (addr.isInSubnet(QHostAddress::parseSubnet("fe80::/10")) - || addr.isInSubnet(QHostAddress::parseSubnet("169.254/16"))) - continue; //cannot bind on link local addresses - QTest::newRow(qPrintable(addr.toString())) << addr << addr; + foreach (const QNetworkInterface &iface, QNetworkInterface::allInterfaces()) { + if ((iface.flags() & QNetworkInterface::IsUp) == 0) + continue; + foreach (const QNetworkAddressEntry &entry, iface.addressEntries()) { + QTest::newRow(qPrintable(entry.ip().toString())) << entry.ip() << entry.ip(); + } } } diff --git a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp index 4bd330b04f..6e04cd9d0e 100644 --- a/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp +++ b/tests/auto/network/socket/qudpsocket/tst_qudpsocket.cpp @@ -1233,6 +1233,8 @@ void tst_QUdpSocket::setMulticastInterface_data() QTest::addColumn<QHostAddress>("address"); QList<QNetworkInterface> interfaces = QNetworkInterface::allInterfaces(); foreach (const QNetworkInterface &iface, interfaces) { + if ((iface.flags() & QNetworkInterface::IsUp) == 0) + continue; foreach (const QNetworkAddressEntry &entry, iface.addressEntries()) { QTest::newRow(QString("%1:%2").arg(iface.name()).arg(entry.ip().toString()).toLatin1()) << iface |