Merge lp:~aacid/ubuntu-system-settings-online-accounts/54_tests into lp:ubuntu-system-settings-online-accounts

[Albert Astals Cid]

Fix tests with Qt 5.4

Only call finished on disconnection if the finish timer is not running
otherwise we end up calling finish twice for the same ui proxy

Seems that with 5.3 the socket disconnected signal was being emitted a bit later
and thus did not affect the tests

[Alberto Mardegan (mardy)]

Looks good, thanks!

review: Approve

=== modified file 'online-accounts-service/ui-proxy.cpp'
--- online-accounts-service/ui-proxy.cpp	2015-01-14 09:31:14 +0000
+++ online-accounts-service/ui-proxy.cpp	2015-02-03 10:24:06 +0000
@@ -64,6 +64,7 @@
 
 private Q_SLOTS:
     void onNewConnection();
+    void onDisconnected();
     void onDataReady(QByteArray &data);
     void onRequestCompleted();
     void onFinishedTimer();
@@ -136,6 +137,15 @@
     m_ipc.write(ba);
 }
 
+void UiProxyPrivate::onDisconnected()
+{
+    Q_Q(UiProxy);
+
+    if (!m_finishedTimer.isActive()) {
+        Q_EMIT q->finished();
+    }
+}
+
 void UiProxyPrivate::onNewConnection()
 {
     Q_Q(UiProxy);
@@ -151,7 +161,7 @@
 
     m_socket = socket;
     QObject::connect(socket, SIGNAL(disconnected()),
-                     q, SIGNAL(finished()));
+                     this, SLOT(onDisconnected()));
     m_ipc.setChannels(socket, socket);
     m_server.close(); // stop listening