Fix QNetworkSession unit tests.

Fix out of process test by trimming input read from lackey.

Don't fail in cleanupTestCase() if sessionOpenCloseStop() is not run due
to command line.

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
index fc0db05567..c7ce963353 100644
--- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
@@ -170,7 +170,7 @@ void tst_QNetworkSession::initTestCase()
     dbus_send.waitForFinished();
 #endif
 
-    inProcessSessionManagementCount = 0;
+    inProcessSessionManagementCount = -1;
 
     QSignalSpy spy(&manager, SIGNAL(updateCompleted()));
     manager.updateConfigurations();
@@ -415,6 +415,8 @@ void tst_QNetworkSession::sessionOpenCloseStop_data()
         QTest::newRow((name + QLatin1String(" stop")).toLocal8Bit().constData())
             << config << true;
     }
+
+    inProcessSessionManagementCount = 0;
 }
 
 void tst_QNetworkSession::sessionOpenCloseStop()
@@ -803,7 +805,7 @@ void tst_QNetworkSession::outOfProcessSession()
             output = oopSocket->readLine().trimmed();
 
         if (output.startsWith("Started session ")) {
-            QString identifier = QString::fromLocal8Bit(output.mid(16).constData());
+            QString identifier = QString::fromLocal8Bit(output.mid(20).constData());
 
             QNetworkConfiguration changed;