diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-06-13 16:05:24 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-03 09:20:13 +0000 |
| commit | 204f46b9e2fcd62760e230c0760bf6fa1013d98e (patch) | |
| tree | 1a9400fd06ecb75b625b0f84e15365674d90b4ab | |
| parent | f94d1cb7b1be6f0bd8d2879caa676bbabf316871 (diff) | |
Skip the threaded systemProxyForQuery test on Windows 7
Under qemu/kvm the systemProxyForQuery call - when initiated from a
secondary thread - never completes. Consequently the thread hangs, test
fails and the crashes due to the inability to cleanly terminate the test
thread.
Task-number: QTQAINFRA-1200
Change-Id: I9bd4ed163d215fadd8532a03bbdccd80fc8d9cb1
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
(cherry picked from commit f17554fce1d693cfd58bd568d2e43e977b3a6507)
| -rw-r--r-- | tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index d67813b954..5733e8f94c 100644 --- a/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -46,7 +46,7 @@ #include <QNetworkReply> #include <QNetworkRequest> #include <QList> - +#include <QSysInfo> #include <QThread> class tst_QNetworkProxyFactory : public QObject { @@ -421,6 +421,9 @@ public: //regression test for QTBUG-18799 void tst_QNetworkProxyFactory::systemProxyForQueryCalledFromThread() { + if (QSysInfo::productType() == QLatin1String("windows") && QSysInfo::productVersion() == QLatin1String("7")) { + QSKIP("This test fails by the systemProxyForQuery() call hanging - QTQAINFRA-1200"); + } QUrl url(QLatin1String("http://qt-project.org")); QNetworkProxyQuery query(url); QSPFQThread thread; |