diff options
author | David Faure <faure@kde.org> | 2012-06-23 11:40:53 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-23 14:16:29 +0200 |
commit | 86ae3809a96e298d2e4c643c90417eb01be87fd9 (patch) | |
tree | 1f4bb3286b28d0b2d90ef518bcf221f569e3ed36 /tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp | |
parent | 3d2a8d09d1444ce659abdc257b7f074b4472b7d7 (diff) |
Skip 3 test methods if the test server isn't set up.
This makes things easier for developers touching QtCore and running
all QtCore unit tests.
Change-Id: I7aa832a6a1be07d90cacad2eecb2364285ff3818
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp')
-rw-r--r-- | tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp index 07a1fff993..2712b19348 100644 --- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp @@ -70,7 +70,6 @@ private slots: void tst_QIODevice::initTestCase() { - QVERIFY(QtNetworkSettings::verifyTestNetworkSettings()); } // Testing get/set functions @@ -96,6 +95,9 @@ void tst_QIODevice::constructing_QTcpSocket() #if defined(Q_OS_WINCE) && defined(WINCE_EMULATOR_TEST) QSKIP("Networking tests in a WinCE emulator are unstable"); #endif + if (!QtNetworkSettings::verifyTestNetworkSettings()) + QSKIP("No network test server available"); + QTcpSocket socket; QIODevice *device = &socket; @@ -256,6 +258,8 @@ void tst_QIODevice::unget() result = QByteArray("ZXCV"); lineResult = "ZXCV"; } else { + if (!QtNetworkSettings::verifyTestNetworkSettings()) + QSKIP("No network test server available"); socket.connectToHost(QtNetworkSettings::serverName(), 80); socket.write("GET / HTTP/1.0\r\n\r\n"); QVERIFY(socket.waitForReadyRead()); |