Merge lp:~tiagosh/checkbox/dbus-timeout into lp:checkbox

[Tiago Salem Herrmann]

fix some dbus timeouts that could make it impossible for an user to recover from a previous session

This MR fixes some dbus timeouts that could make it impossible to recover from a previous session if an user takes more than 15 seconds to decide between "Recover" and "Restart".

[TienFu Chen (ctf)]

I built the package for Precise and verified the patch, works fine.
Tiago, thanks for the work.

review: Approve

=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-03-21 09:23:09 +0000
+++ checkbox_qt/qt_interface.py	2012-03-22 17:07:20 +0000
@@ -36,13 +36,18 @@
 
 OPTION_TO_ANSWER = dict((o, a)
                         for a, o in ANSWER_TO_OPTION.items())
+def dummy_handle_reply(r=None):
+    return
 
+def dummy_handle_error(e=None):
+    return
 
 class QTInterface(UserInterface):
     def __init__(self, title, data_path):
         super(QTInterface, self).__init__(title, data_path)
         self._app_title = title
         notReady = True
+        infoResult = None
         while notReady:
             try:
                 self.bus = dbus.SessionBus(mainloop=DBusGMainLoop())
@@ -233,10 +238,26 @@
         return False
 
     def show_info(self, text, options=[], default=None):
-        return self.qtiface.showInfo(text, options, default)
+        def onInfoBoxResult(result):
+            self.infoResult = str(result)
+            self.loop.quit()
+
+        self.qtiface.showInfo(text, options, default, 
+            reply_handler=dummy_handle_reply,
+            error_handler=dummy_handle_error)
+        self.wait_on_signals(
+            infoBoxResult=onInfoBoxResult)
+        return self.infoResult
 
     def show_error(self, text):
-        self.qtiface.showError(text)
+        def onErrorBoxClosed():
+            self.loop.quit()
+
+        self.qtiface.showError(text,
+            reply_handler=dummy_handle_reply,
+            error_handler=dummy_handle_error)
+        self.wait_on_signals(
+            errorBoxClosed=onErrorBoxClosed)
 
     def update_status(self, job):
         if 'type' in job and job["type"] == "test":

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-21 22:09:17 +0000
+++ debian/changelog	2012-03-22 17:07:20 +0000
@@ -13,6 +13,10 @@
     checkbox_qt/qt_interface.py, plugins/jobs_prompt.py: The selection tree is
     now updated when recovering from a previous run (LP: #937696)
 
+  [Tiago Salem Herrmann]
+  * checkbox_qt/qt_interface.py, qt/frontend/qtfront.cpp, qt/frontend/qtfront.h:
+    Do async calls to some ui methods and avoid unexpected dbus timeouts (LP: #962333)
+
  -- Jeff Lane <[e-mail]>  Wed, 21 Mar 2012 18:08:46 -0400
 
 checkbox (0.13.5) precise; urgency=low

=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-03-20 22:31:41 +0000
+++ qt/frontend/qtfront.cpp	2012-03-22 17:07:20 +0000
@@ -245,6 +245,7 @@
 void QtFront::showError(QString text)
 {
     QMessageBox::critical(ui->tabWidget, "Error", text);
+    emit errorBoxClosed();
 }
 
 void QtFront::setWindowTitle(QString title)
@@ -515,7 +516,7 @@
     }
 }
 
-QString QtFront::showInfo(QString text, QStringList options, QString defaultoption)
+void QtFront::showInfo(QString text, QStringList options, QString defaultoption)
 {
     // workaround, show the main window if the welcome screen wasn't shown yet
     m_mainWindow->show();
@@ -532,7 +533,7 @@
     dialog->exec();
     QString result = buttonMap[dialog->clickedButton()];
     delete dialog;
-    return result;
+    emit infoBoxResult(result);
 }
 
 QString QtFront::getEmailAddress()

=== modified file 'qt/frontend/qtfront.h'
--- qt/frontend/qtfront.h	2012-03-20 22:31:41 +0000
+++ qt/frontend/qtfront.h	2012-03-22 17:07:20 +0000
@@ -44,7 +44,7 @@
     void showText(QString text);
     void setWindowTitle(QString title);
     void startProgressBar(QString text);
-    void showError(QString text);
+    Q_NOREPLY void showError(QString text);
     void stopProgressBar();
     void showTree(QString text, QVariantMap options, QVariantMap defaults);
     void showEntry(QString text);
@@ -54,7 +54,7 @@
     void showTest(QString purpose, QString steps, QString verification, QString info, QString comment, QString testType, QString testName, bool enableTestButton);
     void showTestControls(bool enableTestControls);
     void setFocusTestYesNo(bool status);
-    QString showInfo(QString text, QStringList options, QString defaultoption);
+    Q_NOREPLY void showInfo(QString text, QStringList options, QString defaultoption);
     void setUiFlags(QVariantMap flags);
     void updateAutoTestStatus(QString status, QString testName);
 
@@ -87,6 +87,8 @@
     void reviewTestsClicked();
     void closedFrontend(bool testsFinished);
     void welcomeCheckboxToggled(bool toogled);
+    void infoBoxResult(QString result);
+    void errorBoxClosed();
 
 private:
     bool registerService();