Mark unstable windows network tests

This is unfortunately still "most of them", because of QTBUG-24451
however some of the unit tests are still possible to test stably.

Also skipped test cases which would hang forever due to QTBUG-24451.

Bearer tests are not run, because they pass when test machine has no
wireless LAN, but fail or hang if it does (QTBUG-24503)

Change-Id: Icf99d45707102d2ef9219ed0b5ad521605716219
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

diff --git a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
index 694dec2..ba40157 100644 (file)
--- a/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
+++ b/tests/auto/network/kernel/qnetworkinterface/qnetworkinterface.pro
@@ -3,3 +3,5 @@ TARGET = tst_qnetworkinterface
 SOURCES  += tst_qnetworkinterface.cpp
 
 QT = core network testlib
+
+win32:CONFIG+=insignificant_test      # QTBUG-24451 - localAddress()

diff --git a/tests/auto/network/network.pro b/tests/auto/network/network.pro
index 3eafd7d..2048d14 100644 (file)
--- a/tests/auto/network/network.pro
+++ b/tests/auto/network/network.pro
@@ -6,3 +6,7 @@ SUBDIRS=\
    ssl \
    socket \
 
+win32 {
+    socket.CONFIG += no_check_target      # QTBUG-24451 - all socket tests require waitForX
+    bearer.CONFIG += no_check_target      # QTBUG-24503 - these tests fail if machine has a WLAN adaptor
+}

diff --git a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
index 5395c7c..3c7c3a3 100644 (file)
--- a/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
+++ b/tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
@@ -1475,6 +1475,9 @@ void tst_QTcpSocket::waitForBytesWritten()
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::waitForBytesWrittenMinusOne()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-24451 - indefinite wait may hang");
+#endif
     QTcpSocket *socket = newSocket();
     socket->connectToHost(QtNetworkSettings::serverName(), 80);
     QVERIFY(socket->waitForConnected(10000));
@@ -1500,6 +1503,9 @@ void tst_QTcpSocket::waitForReadyRead()
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::waitForReadyReadMinusOne()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-24451 - indefinite wait may hang");
+#endif
     QTcpSocket *socket = newSocket();
     socket->connectToHost(QtNetworkSettings::serverName(), 80);
     socket->write("GET / HTTP/1.0\r\n\r\n");
@@ -2102,6 +2108,9 @@ void tst_QTcpSocket::abortiveClose_abortSlot()
 //----------------------------------------------------------------------------------
 void tst_QTcpSocket::localAddressEmptyOnBSD()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-24451 - indefinite wait may hang");
+#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return; //proxy not useful for localhost test case

diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index cdb397c..2f9ed0d 100644 (file)
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -1157,6 +1157,9 @@ void tst_QSslSocket::waitForEncrypted()
 
 void tst_QSslSocket::waitForEncryptedMinusOne()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-24451 - indefinite wait may hang");
+#endif
     if (!QSslSocket::supportsSsl())
         return;
 
@@ -1663,6 +1666,9 @@ protected:
 
 void tst_QSslSocket::waitForMinusOne()
 {
+#ifdef Q_OS_WIN
+    QSKIP("QTBUG-24451 - indefinite wait may hang");
+#endif
     QFETCH_GLOBAL(bool, setProxy);
     if (setProxy)
         return;

diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index 33b55b4..5aeb0e4 100644 (file)
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -22,3 +22,5 @@ wince* {
 }
 
 requires(contains(QT_CONFIG,private_tests))
+
+win32:CONFIG+=insignificant_test      # QTBUG-24451 - all

diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
index 8a500a3..3955ea1 100644 (file)
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -22,3 +22,5 @@ wince* {
 }
 
 requires(contains(QT_CONFIG,private_tests))
+
+win32:CONFIG+=insignificant_test      # QTBUG-24451 - all