1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stabilisation of tst_qnetworkreply on windows

Browse Source 
Workaround QTBUG-24451 by retrying creation of SocketPair if it fails
(waitForConnected and waitForNewConnection are used in the factory
function).
Skip very unstable test cases due to QTBUG-25386

Change-Id: I32129922329b895eb3719d61719c487a4d52c466
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Shane Kearns 2012-04-18 20:31:35 +01:00 committed by Qt by Nokia
parent ac090486c4
commit 7742b2c97c
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -3821,9 +3821,13 @@ void tst_QNetworkReply::ioPutToFileFromSocket()
QFETCH(QByteArray, data); QFETCH(QByteArray, data);
SocketPair socketpair; SocketPair socketpair;
socketpair.create(); QTRY_VERIFY(socketpair.create()); //QTRY_VERIFY as a workaround for QTBUG-24451
QVERIFY(socketpair.endPoints[0] && socketpair.endPoints[1]);
#ifdef Q_OS_WIN
//128k and 2M tests regularly fail. Assumed same characteristics as ioPostToHttpFromSocket
if (data.size() > 1000)
QSKIP("unstable on windows - QTBUG-25386");
#endif
socketpair.endPoints[0]->write(data); socketpair.endPoints[0]->write(data);
QNetworkReplyPtr reply(manager.put(QNetworkRequest(url), socketpair.endPoints[1])); QNetworkReplyPtr reply(manager.put(QNetworkRequest(url), socketpair.endPoints[1]));
socketpair.endPoints[0]->close(); socketpair.endPoints[0]->close();
@ -4109,9 +4113,13 @@ void tst_QNetworkReply::ioPostToHttpFromSocket()
QFETCH(QByteArray, data); QFETCH(QByteArray, data);
QFETCH(QUrl, url); QFETCH(QUrl, url);
QFETCH(QNetworkProxy, proxy); QFETCH(QNetworkProxy, proxy);
#ifdef Q_OS_WIN
//QTBUG-25386 hits one of the 128k tests 50% of the time, one of the 4k tests rarely (but at least 1%)
if (data.size() > 1000)
QSKIP("unstable on windows - QTBUG-25386");
#endif
SocketPair socketpair; SocketPair socketpair;
socketpair.create(); QTRY_VERIFY(socketpair.create()); //QTRY_VERIFY as a workaround for QTBUG-24451
QVERIFY(socketpair.endPoints[0] && socketpair.endPoints[1]);
socketpair.endPoints[0]->write(data); socketpair.endPoints[0]->write(data);
@ -4182,8 +4190,7 @@ void tst_QNetworkReply::ioPostToHttpFromSocketSynchronous()
QFETCH(QByteArray, data); QFETCH(QByteArray, data);
SocketPair socketpair; SocketPair socketpair;
QVERIFY(socketpair.create()); QTRY_VERIFY(socketpair.create()); //QTRY_VERIFY as a workaround for QTBUG-24451
QVERIFY(socketpair.endPoints[0] && socketpair.endPoints[1]);
socketpair.endPoints[0]->write(data); socketpair.endPoints[0]->write(data);
socketpair.endPoints[0]->waitForBytesWritten(5000); socketpair.endPoints[0]->waitForBytesWritten(5000);
// ### for 4.8: make the socket pair unbuffered, to not read everything in one go in QNetworkReplyImplPrivate::setup() // ### for 4.8: make the socket pair unbuffered, to not read everything in one go in QNetworkReplyImplPrivate::setup()
@ -4301,8 +4308,7 @@ void tst_QNetworkReply::ioPostToHttpNoBufferFlag()
QByteArray data = QByteArray("daaaaaaataaaaaaa"); QByteArray data = QByteArray("daaaaaaataaaaaaa");
// create a sequential QIODevice by feeding the data into a local TCP server // create a sequential QIODevice by feeding the data into a local TCP server
SocketPair socketpair; SocketPair socketpair;
socketpair.create(); QTRY_VERIFY(socketpair.create()); //QTRY_VERIFY as a workaround for QTBUG-24451
QVERIFY(socketpair.endPoints[0] && socketpair.endPoints[1]);
socketpair.endPoints[0]->write(data); socketpair.endPoints[0]->write(data);
QUrl url = "http://" + QtNetworkSettings::serverName() + "/qtest/protected/cgi-bin/md5sum.cgi"; QUrl url = "http://" + QtNetworkSettings::serverName() + "/qtest/protected/cgi-bin/md5sum.cgi";