Merge lp:~thomir-deactivatedaccount/autopilot-qt/always-send-dbus-reply into lp:autopilot-qt

[Thomi Richards]

Autopilot-qt now sends empty dbus replies when a call fails, instead of not sending a reply at all.

Problem:

Sometimes, autopilot-qt fails to find the node specified by autopilot client side. This most often happens when the node is removed, or when xpathsleect fails for some reason. When this happens, autopilot-qt fails to send a dbus reply message, which makes whatever is on the client side hang for the dbus timeout period (10 seconds, I think).

Solution:

This branch makes autopilot-qt send an empty dbus reply straight away. This avoids the timeout on the client-side.

Tested interactively. To reproduce, run autopilot vis against an application running autopilot-qt without this branch - you will see a long delay whenever selecting an object. Running it against autopilot-qt that's built from this branch will remove that delay.

[Christopher Lee (veebers)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/autopilot-qt-autolanding/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-amd64-autolanding/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-armhf-autolanding/1/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:40
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-amd64-ci/3/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-armhf-ci/3/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/3/rebuild

review: Approve (continuous-integration)

=== modified file 'driver/dbus_object.cpp'
--- driver/dbus_object.cpp	2013-01-17 19:48:27 +0000
+++ driver/dbus_object.cpp	2013-03-14 21:50:26 +0000
@@ -66,7 +66,10 @@
 
     QtNode::Ptr node = GetNodeWithId(object_id);
     if (! node)
+    {
+        qWarning() << "Unable to register signal interest.";
         return;
+    }
 
     QObject* obj = node->getWrappedObject();
 
@@ -123,68 +126,74 @@
 void DBusObject::ListSignals(int object_id, const QDBusMessage& message)
 {
     QtNode::Ptr node = GetNodeWithId(object_id);
+    QDBusMessage reply = message.createReply();
     if (! node)
-        return;
-
-    QObject *object = node->getWrappedObject();
-    const QMetaObject *meta = object->metaObject();
-    QList<QVariant> signal_list;
-    do
-    {
-        for (int i = meta->methodOffset(); i < meta->methodCount(); ++i)
+    {
+        qWarning() << "Unable to list signals.";
+    }
+    else
+    {
+        QObject *object = node->getWrappedObject();
+        const QMetaObject *meta = object->metaObject();
+        QList<QVariant> signal_list;
+        do
         {
-            QMetaMethod method = meta->method(i);
-            if (method.methodType() == QMetaMethod::Signal)
+            for (int i = meta->methodOffset(); i < meta->methodCount(); ++i)
             {
+                QMetaMethod method = meta->method(i);
+                if (method.methodType() == QMetaMethod::Signal)
+                {
 #ifdef QT5_SUPPORT
-                QString signature = QString::fromLatin1(method.methodSignature());
+                    QString signature = QString::fromLatin1(method.methodSignature());
 #else
-                QString signature = QString::fromLatin1(method.signature());
+                    QString signature = QString::fromLatin1(method.signature());
 #endif
-                signal_list.append(QVariant(signature));
+                    signal_list.append(QVariant(signature));
+                }
             }
-        }
-        meta = meta->superClass();
-    } while(meta);
-
-    QDBusMessage reply = message.createReply();
-    reply << QVariant(signal_list);
+            meta = meta->superClass();
+        } while(meta);
+
+        reply << QVariant(signal_list);
+    }
+
     QDBusConnection::sessionBus().send(reply);
 }
 
 void DBusObject::ListMethods(int object_id, const QDBusMessage &message)
 {
+    QDBusMessage reply = message.createReply();
     QtNode::Ptr node = GetNodeWithId(object_id);
     if (! node)
     {
-        qWarning() << "No Object found.";
-        return;
+        qWarning() << "No Object found while listing methods.";
     }
-
-    QObject *object = node->getWrappedObject();
-    const QMetaObject *meta = object->metaObject();
-    QList<QVariant> method_list;
-    do
+    else
     {
-        for (int i = meta->methodOffset(); i < meta->methodCount(); ++i)
+        QObject *object = node->getWrappedObject();
+        const QMetaObject *meta = object->metaObject();
+        QList<QVariant> method_list;
+        do
         {
-            QMetaMethod method = meta->method(i);
-            if (method.methodType() == QMetaMethod::Slot ||
-                method.methodType() == QMetaMethod::Method)
+            for (int i = meta->methodOffset(); i < meta->methodCount(); ++i)
             {
+                QMetaMethod method = meta->method(i);
+                if (method.methodType() == QMetaMethod::Slot ||
+                    method.methodType() == QMetaMethod::Method)
+                {
 #ifdef QT5_SUPPORT
-                QString signature = QString::fromLatin1(method.methodSignature());
+                    QString signature = QString::fromLatin1(method.methodSignature());
 #else
-                QString signature = QString::fromLatin1(method.signature());
+                    QString signature = QString::fromLatin1(method.signature());
 #endif
-                method_list.append(QVariant(signature));
+                    method_list.append(QVariant(signature));
+                }
             }
-        }
-        meta = meta->superClass();
-    } while(meta);
+            meta = meta->superClass();
+        } while(meta);
 
-    QDBusMessage reply = message.createReply();
-    reply << QVariant(method_list);
+        reply << QVariant(method_list);
+    }
     QDBusConnection::sessionBus().send(reply);
 }