whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
David Faure 2012-06-23 11:40:53 +02:00 committed by Qt by Nokia
parent 3d2a8d09d1
commit 86ae3809a9
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
View File

@ -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());

5
tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp
View File

@ -253,8 +253,6 @@ tst_QTextStream::tst_QTextStream()
void tst_QTextStream::initTestCase()
{
QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
testFileName = tempDir.path() + "/testfile";
// chdir into the testdata dir and refer to our helper apps with relative paths
@ -1108,6 +1106,9 @@ void tst_QTextStream::stillOpenWhenAtEnd()
#ifdef Q_OS_WINCE
QSKIP("Qt/CE: Cannot test network on emulator");
#endif
if (!QtNetworkSettings::verifyTestNetworkSettings())
QSKIP("No network test server available");
QTcpSocket socket;
socket.connectToHost(QtNetworkSettings::serverName(), 143);
QVERIFY(socket.waitForReadyRead(5000));