diff options
| author | Martin Petersson <martin.petersson@nokia.com> | 2012-07-11 12:31:29 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-01 18:12:34 +0200 |
| commit | b8453b6fe3552cdfe32c726f87bb30d897c679b0 (patch) | |
| tree | 544227e592bda31eaf8ba266f33f7cadb6336a45 /tests/auto/network/access | |
| parent | e178b49522465becf1b0c56bff1974e6037ba9ec (diff) | |
QtNetwork: Handle FD_CLOSE on Windows
We need to handle FD_CLOSE separately on Windows as this will be sent
only once. When we get FD_CLOSE we need to check if there is more data
available for reading. It there is this might indicate that there is
another FD_READ that we need to handle after the FD_CLOSE. So in this
case we will manually create another close event.
Task-number: QTBUG-19409
Task-number: QTBUG-25386
Change-Id: Ie19906bc3f64fb6a85a508a5ab12caac5d70ccdb
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tests/auto/network/access')
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index a7ac2661d5..55fe4f45b4 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -3820,11 +3820,6 @@ void tst_QNetworkReply::ioPutToFileFromSocket() SocketPair socketpair; QTRY_VERIFY(socketpair.create()); //QTRY_VERIFY as a workaround for QTBUG-24451 -#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); QNetworkReplyPtr reply(manager.put(QNetworkRequest(url), socketpair.endPoints[1])); socketpair.endPoints[0]->close(); @@ -4110,11 +4105,7 @@ void tst_QNetworkReply::ioPostToHttpFromSocket() QFETCH(QByteArray, data); QFETCH(QUrl, url); 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; QTRY_VERIFY(socketpair.create()); //QTRY_VERIFY as a workaround for QTBUG-24451 |