From 6d3558b4492027f54e6dab702c115a251eb9e9d0 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 1 Jan 2015 18:21:35 -0200
Subject: Autotest: Be nicer when asking the sub-processes to exit

Instead of killing them outright (and note that terminate() doesn't work
on Windows), ask them nicely to exit on their own. This way, if we run
them in valgrind, valgrind gets a chance to print the leak check output
and summary.

Change-Id: Ib6cc8d4560ff0bf255f94980eb220e97592c00f0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
---
 tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp')

diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
index 49462d388c..900faeb68e 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
@@ -87,6 +87,11 @@ public slots:
         emit targetObj.complexSignal(reg);
     }
 
+    void quit()
+    {
+        qApp->quit();
+    }
+
 private slots:
     void handleConnection(const QDBusConnection& con)
     {
-- 
cgit v1.2.3


From aa83bacb14dac06eb7226c8c688f37eeecec15d4 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 1 Jan 2015 19:56:06 -0200
Subject: Autotest: fix a race condition in verifying a peer D-Bus connected

On the unit test side, everything is sequential: we first ask for the
connection, verify that it is connected, then ask the remote side via
the session bus if it is connected. Unfortunately, the remote site may
handle things in a different order: it may handle the incoming function
call to "isConnected" before doing accept(2) on the listening socket.

So, instead, make the local side block until the connection is received
on the other side. On the remote, we don't block, instead we use the
feature of delayed replies.

Change-Id: Ie386938b8b39dd94a9d7e5913668125fb4a3c7da
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 .../dbus/qdbusabstractinterface/qpinger/qpinger.cpp     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp')

diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
index 900faeb68e..e681d06102 100644
--- a/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
+++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/qpinger.cpp
@@ -59,9 +59,17 @@ public slots:
         return QDBusServer::address();
     }
 
-    bool isConnected() const
+    void waitForConnected()
     {
-        return m_conn.isConnected();
+        if (callPendingReply.type() != QDBusMessage::InvalidMessage) {
+            sendErrorReply(QDBusError::NotSupported, "One call already pending!");
+            return;
+        }
+        if (m_conn.isConnected())
+            return;
+        // not connected, we'll reply later
+        setDelayedReply(true);
+        callPendingReply = message();
     }
 
     void reset()
@@ -97,11 +105,16 @@ private slots:
     {
         m_conn = con;
         m_conn.registerObject("/", &targetObj, QDBusConnection::ExportScriptableContents);
+        if (callPendingReply.type() != QDBusMessage::InvalidMessage) {
+            QDBusConnection::sessionBus().send(callPendingReply.createReply());
+            callPendingReply = QDBusMessage();
+        }
     }
 
 private:
     Interface targetObj;
     QDBusConnection m_conn;
+    QDBusMessage callPendingReply;
 };
 
 int main(int argc, char *argv[])
-- 
cgit v1.2.3