diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-11-08 16:18:31 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2017-11-15 04:50:18 +0000 |
| commit | 66bace390ba4c0d20f006f02dbcba45e30d08590 (patch) | |
| tree | cf8b595c46b294f1e1fce1ee2497581bbcc44861 | |
| parent | 25b18fb241315ed314b6b67f4b97028e2a1e484a (diff) | |
tst_qnetworkreply::getFromUnreachableIp - fix win64 also
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>
| -rw-r--r-- | tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp index b86750a900..3a752c0748 100644 --- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp +++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp @@ -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)); |