diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp index 82a4193..b04556c 100644 --- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -146,6 +146,10 @@ void tst_QNetworkProxyFactory::systemProxyForQuery() const void tst_QNetworkProxyFactory::fromConfigurations() { QNetworkConfigurationManager manager; + //update is done to get the active / discovered states + manager.updateConfigurations(); + connect(&manager, SIGNAL(updateCompleted()), &QTestEventLoop::instance(), SLOT(exitLoop())); + QTestEventLoop::instance().enterLoop(10); QList<QNetworkProxy> proxies; QUrl url(QLatin1String("http://qt.nokia.com")); //get from known configurations @@ -233,8 +237,6 @@ void tst_QNetworkProxyFactory::inNetworkAccessManager() foreach (QNetworkProxy proxy, proxies) { qDebug() << formatProxyName(proxy); } - if (config.type() != QNetworkConfiguration::InternetAccessPoint) - QEXPECT_FAIL("","QNetworkProxyFactory::systemProxyForQuery doesn't work for service networks yet", Continue); QCOMPARE(factory->returnedList, proxies); } |