Merge commit 'BearerIntegration-5' into remove-manual-test

Conflicts:
	tests/auto/qnetworksession/lackey/lackey.pro
	tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp

2 files changed, 20 insertions, 7 deletions

diff --git a/tests/auto/qnetworksession/lackey/lackey.pro b/tests/auto/qnetworksession/lackey/lackey.pro
index 6cc1b43..3ed9850 100644
--- a/tests/auto/qnetworksession/lackey/lackey.pro
+++ b/tests/auto/qnetworksession/lackey/lackey.pro
@@ -2,3 +2,9 @@ SOURCES += main.cpp
 TARGET = qnetworksessionlackey
 
 QT = core network
+
+symbian {
+     # Needed for interprocess communication and opening QNetworkSession
+     TARGET.CAPABILITY = NetworkControl NetworkServices
+}
+
diff --git a/tests/auto/qnetworksession/lackey/main.cpp b/tests/auto/qnetworksession/lackey/main.cpp
index a84021d..1e40485 100644
--- a/tests/auto/qnetworksession/lackey/main.cpp
+++ b/tests/auto/qnetworksession/lackey/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -54,16 +54,23 @@ QT_USE_NAMESPACE
 #define NO_DISCOVERED_CONFIGURATIONS_ERROR 1
 #define SESSION_OPEN_ERROR 2
 
+
 int main(int argc, char** argv)
 {
     QCoreApplication app(argc, argv);
 
     QNetworkConfigurationManager manager;
     QList<QNetworkConfiguration> discovered =
+#if defined (Q_OS_SYMBIAN)
+        // On Symbian, on the first query (before updateConfigurations() call
+        // the discovered-states are not correct, so defined-state will do.
+        manager.allConfigurations(QNetworkConfiguration::Defined);
+#else
         manager.allConfigurations(QNetworkConfiguration::Discovered);
-
-    if (discovered.isEmpty())
+#endif
+    if (discovered.isEmpty()) {
         return NO_DISCOVERED_CONFIGURATIONS_ERROR;
+    }
 
     // Cannot read/write to processes on WinCE or Symbian.
     // Easiest alternative is to use sockets for IPC.
@@ -85,15 +92,16 @@ int main(int argc, char** argv)
         qDebug() << "Discovered configurations:" << discovered.count();
 
         if (discovered.isEmpty()) {
-            qDebug() << "No more configurations";
+            qDebug() << "No more discovered configurations";
             break;
         }
 
         qDebug() << "Taking first configuration";
 
         QNetworkConfiguration config = discovered.takeFirst();
+
         if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            qDebug() << config.name() << "is active";
+            qDebug() << config.name() << "is active, therefore skipping it (looking for configs in 'discovered' state).";
             continue;
         }
 
@@ -104,12 +112,11 @@ int main(int argc, char** argv)
         QString output = QString("Starting session for %1\n").arg(config.identifier());
         oopSocket.write(output.toAscii());
         oopSocket.waitForBytesWritten();
-
         session->open();
         session->waitForOpened();
     } while (!(session && session->isOpen()));
 
-    qDebug() << "loop done";
+    qDebug() << "lackey: loop done";
 
     if (!session) {
         qDebug() << "Could not start session";