diff options
author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-19 13:56:55 (GMT) |
---|---|---|
committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-19 13:56:55 (GMT) |
commit | 94051a438e64eaede021b4e926ef58f793a09a70 (patch) | |
tree | 9860dc49d8e6453df356f51da9126b583ac35206 /tests/auto/qnetworkproxyfactory | |
parent | 06557b8d7c472c6298f7d8b310feda225864265f (diff) | |
parent | 35b5f15c3fe5c2f1f0d046d09b9d95dee3bb91b5 (diff) | |
download | Qt-94051a438e64eaede021b4e926ef58f793a09a70.zip Qt-94051a438e64eaede021b4e926ef58f793a09a70.tar.gz Qt-94051a438e64eaede021b4e926ef58f793a09a70.tar.bz2 |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'tests/auto/qnetworkproxyfactory')
-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 e03c8e9..136d4d8 100644 --- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp +++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp @@ -174,6 +174,10 @@ void tst_QNetworkProxyFactory::systemProxyForQueryCalledFromThread() 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 @@ -261,8 +265,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); } |