summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-07-01 11:47:07 +0200
committerMorten Johan Sørvig <morten.sorvig@digia.com>2014-07-02 09:28:34 +0200
commitddeb90744260c9842e58339a0a16da2380867bc5 (patch)
tree6cde751df18d995e450fba3f528d0cbdf91e1c12
parent23961aa54cfc688b66b206c6d04122c0d36fc98f (diff)
Skip unstable autotests in QtBase.
The combination of these unstable tests makes it very hard to get changes through the CI system due to the unrelated test failures. Skip the following test functions: tst_QIODevice::unget QTBUG-39983 (Mac) tst_QThreadPool:expiryTimeoutRace QTBUG-3786 (Windows) tst_QLocalSocket::processConnection QTBUG-39986 (Mac) tst_QTcpServer::adressReusable QTBUG-39985 (Linux) Change-Id: I96559bea0d437fd25966b6ccac1ece1490e06241 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
-rw-r--r--tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp3
-rw-r--r--tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp3
-rw-r--r--tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp4
-rw-r--r--tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp3
4 files changed, 13 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
index 13f8ced842..19f4549706 100644
--- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
+++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp
@@ -194,6 +194,9 @@ void tst_QIODevice::unget()
#if defined(Q_OS_WINCE) && defined(WINCE_EMULATOR_TEST)
QSKIP("Networking tests in a WinCE emulator are unstable");
#endif
+#if defined(Q_OS_MAC)
+ QSKIP("The unget network test is unstable on Mac. See QTBUG-39983.");
+#endif
QBuffer buffer;
buffer.open(QBuffer::ReadWrite);
buffer.write("ZXCV");
diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index 0c91c419cc..3bf25da5ee 100644
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -371,6 +371,9 @@ void tst_QThreadPool::expiryTimeout()
void tst_QThreadPool::expiryTimeoutRace() // QTBUG-3786
{
+#ifdef Q_OS_WIN
+ QSKIP("This test is unstable on Windows. See QTBUG-3786.");
+#endif
ExpiryTimeoutTask task;
QThreadPool threadPool;
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 6053021cf4..b70fa5c881 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -829,6 +829,10 @@ private:
*/
void tst_QLocalSocket::processConnection()
{
+#ifdef Q_OS_MAC
+ QSKIP("The processConnection test is unstable on Mac. See QTBUG-39986.");
+#endif
+
#ifdef Q_OS_WIN
const QString exeSuffix = QStringLiteral(".exe");
#else
diff --git a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
index f01d79d9bc..23a1455571 100644
--- a/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/network/socket/qtcpserver/tst_qtcpserver.cpp
@@ -576,6 +576,9 @@ protected:
#ifndef QT_NO_PROCESS
void tst_QTcpServer::addressReusable()
{
+#ifdef Q_OS_LINUX
+ QSKIP("The addressReusable test is unstable on Linux. See QTBUG-39985.");
+#endif
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
#ifndef QT_NO_NETWORKPROXY