AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autotest: when using libproxy, QNetworkProxyFactory isn't generic

Browse Source 
Looks like whoever created the blacklist never tried to figure out why
it happened.

Change-Id: I84e45059a888497fb55ffffd14d2fb29e32a4521
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
This commit is contained in:
Thiago Macieira 2017-07-20 01:03:03 -07:00 committed by Timur Pocheptsov
parent 1394610c79
commit 84fcc38955
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/network/kernel/qnetworkproxyfactory/BLACKLIST
View File

@ -1,2 +0,0 @@
[genericSystemProxy]
ubuntu-14.04

2
tests/auto/network/kernel/qnetworkproxyfactory/qnetworkproxyfactory.pro
View File

@ -4,6 +4,6 @@
CONFIG += testcase CONFIG += testcase
TARGET = tst_qnetworkproxyfactory TARGET = tst_qnetworkproxyfactory
QT = core network testlib QT = core network-private testlib
SOURCES += tst_qnetworkproxyfactory.cpp SOURCES += tst_qnetworkproxyfactory.cpp

4
tests/auto/network/kernel/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
View File

@ -44,6 +44,8 @@
#include <QSysInfo> #include <QSysInfo>
#include <QThread> #include <QThread>
#include <private/qtnetworkglobal_p.h>
class tst_QNetworkProxyFactory : public QObject { class tst_QNetworkProxyFactory : public QObject {
Q_OBJECT Q_OBJECT
@ -367,7 +369,7 @@ void tst_QNetworkProxyFactory::genericSystemProxy()
QFETCH(int, port); QFETCH(int, port);
// The generic system proxy is only available on the following platforms // The generic system proxy is only available on the following platforms
#if (!defined Q_OS_WIN) && (!defined Q_OS_OSX) #if (!defined Q_OS_WIN) && (!defined Q_OS_OSX) && !QT_CONFIG(libproxy)
qputenv(envVar, url); qputenv(envVar, url);
const QList<QNetworkProxy> systemProxy = QNetworkProxyFactory::systemProxyForQuery(); const QList<QNetworkProxy> systemProxy = QNetworkProxyFactory::systemProxyForQuery();
QCOMPARE(systemProxy.size(), 1); QCOMPARE(systemProxy.size(), 1);