Update bearer startup code in network autotests

The bearer startup code I added to some of the network autotests to
ensure the network was up before testing caused test failures on some
linux configurations due to there being no default network defined.

I've changed it to follow these steps:
1. update the configuration list & wait for update completed signal
 - due to the polling engines not having any config defined on the first
   run before the initial poll happens
2. check default configuration is valid before attempting to start it
3a. for valid configuration, start it and wait for started as before
3b. for invalid configuration, fail if bearer is mandatory, otherwise ignore
 - on symbian bearer use is "mandatory", on desktop platforms it is optional

Reviewed-by: Markus Goetz

1 files changed, 11 insertions, 4 deletions

diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index c70075f..97ffead 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1283,11 +1283,18 @@ void tst_QNetworkReply::initTestCase()
 #endif
 #ifndef QT_NO_BEARERMANAGEMENT
     netConfMan = new QNetworkConfigurationManager(this);
+    netConfMan->updateConfigurations();
+    connect(netConfMan, SIGNAL(updateCompleted()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
     networkConfiguration = netConfMan->defaultConfiguration();
-    networkSession.reset(new QNetworkSession(networkConfiguration));
-    if (!networkSession->isOpen()) {
-        networkSession->open();
-        QVERIFY(networkSession->waitForOpened(30000));
+    if (networkConfiguration.isValid()) {
+        networkSession.reset(new QNetworkSession(networkConfiguration));
+        if (!networkSession->isOpen()) {
+            networkSession->open();
+            QVERIFY(networkSession->waitForOpened(30000));
+        }
+    } else {
+        QVERIFY(!(netConfMan->capabilities() & QNetworkConfigurationManager::NetworkSessionRequired));
     }
 #endif
 }