From 8e08286d45e90e0d30056dd65c261601b3ee002d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pasi=20Pet=C3=A4j=C3=A4j=C3=A4rvi?= Date: Tue, 15 Mar 2022 11:35:24 +0200 Subject: tst_QNetworkInterface: Update network test server handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds docker support and makes it no longer skip the whole test if there is no docker or network server. Pick-to: 6.2 6.3 Change-Id: Ie98496df338a804d5c9842cce372e3410fdf9990 Reviewed-by: Mårten Nordheim Reviewed-by: Timur Pocheptsov --- .../kernel/qnetworkinterface/tst_qnetworkinterface.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp') diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index eb3b6f911e..d637b1b251 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -60,6 +60,8 @@ private slots: void interfaceFromXXX_data(); void interfaceFromXXX(); void copyInvalidInterface(); +private: + bool hasNetworkServer = false; }; tst_QNetworkInterface::tst_QNetworkInterface() @@ -84,8 +86,11 @@ bool tst_QNetworkInterface::isIPv6Working() void tst_QNetworkInterface::initTestCase() { - if (!QtNetworkSettings::verifyTestNetworkSettings()) - QSKIP("No network test server available"); +#ifdef QT_TEST_SERVER + hasNetworkServer = QtNetworkSettings::verifyConnection(QtNetworkSettings::httpServerName(), 80); +#else + hasNetworkServer = QtNetworkSettings::verifyTestNetworkSettings(); +#endif } void tst_QNetworkInterface::dump() @@ -195,7 +200,8 @@ void tst_QNetworkInterface::localAddress_data() if (ipv6) QTest::newRow("localhost-ipv6") << QHostAddress(QHostAddress::LocalHostIPv6); - QTest::newRow("test-server") << QtNetworkSettings::serverIP(); + if (hasNetworkServer) + QTest::newRow("test-server") << QtNetworkSettings::httpServerIp(); QSet added; const QList ifaces = QNetworkInterface::allInterfaces(); -- cgit v1.2.3