diff options
| -rw-r--r-- | tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp index f6c230714a..28e39c6369 100644 --- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp @@ -276,12 +276,15 @@ void tst_QIODevice::unget() lineResult = "ZXCV"; } else { #ifdef QT_TEST_SERVER - if (!QtNetworkSettings::verifyConnection(QtNetworkSettings::httpServerName(), 80)) - QSKIP("No network test server available"); + const bool hasNetworkServer = + QtNetworkSettings::verifyConnection(QtNetworkSettings::httpServerName(), 80); #else - if (!QtNetworkSettings::verifyTestNetworkSettings()) - QSKIP("No network test server available"); + const bool hasNetworkServer = QtNetworkSettings::verifyTestNetworkSettings(); #endif + if (!hasNetworkServer) { + qInfo("No network test server: skipping QTcpSocket part of test."); + continue; + } socket.connectToHost(QtNetworkSettings::httpServerName(), 80); socket.write("GET / HTTP/1.0\r\n\r\n"); QVERIFY(socket.waitForReadyRead()); |