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

tst_qnetworkreply::getFromUnreachableIp - fix win64 also

Browse Source 
Looking at the failures in grafana it appears this test is also failing
on Windows 64. The same fix applies then, and we use Q_OS_WIN now.

Change-Id: Iafcfd6d1e747f3c816878cad072fbfae3aee19ca
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Timur Pocheptsov 2017-11-08 16:18:31 +01:00
parent 25b18fb241
commit 66bace390b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6766,9 +6766,9 @@ void tst_QNetworkReply::getFromUnreachableIp()
{
QNetworkAccessManager manager;
#ifdef Q_OS_WIN32
#ifdef Q_OS_WIN
// This test assumes that attempt to connect to 255.255.255.255 fails more
// or less fast/immediately. This is not what we observe on Windows x86:
// or less fast/immediately. This is not what we observe on Windows:
// WSAConnect on non-blocking socket returns SOCKET_ERROR, WSAGetLastError
// returns WSAEWOULDBLOCK (expected) and getsockopt most of the time returns
// NOERROR; so socket engine starts a timer (30 s.) and waits for a timeout/
@ -6806,7 +6806,7 @@ void tst_QNetworkReply::getFromUnreachableIp()
#else // bearermanagement
QSKIP("This test is non-deterministic on Windows x86");
#endif // !bearermanagement
#endif // Q_OS_WIN32
#endif // Q_OS_WIN
QNetworkRequest request(QUrl("http://255.255.255.255/42/23/narf/narf/narf"));
QNetworkReplyPtr reply(manager.get(request));