Merge lp:~tiagosh/checkbox/fix-auto-test-status into lp:checkbox

[Tiago Salem Herrmann]

update the status box also for automatic tests executed by the backend.

[Daniel Manrique (roadmr)]

I tested it and it works as advertised. Thanks!

(btw, I just added the changelog entry prior to merging to trunk).

review: Approve

=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-02-29 18:49:58 +0000
+++ checkbox_qt/qt_interface.py	2012-03-08 17:28:47 +0000
@@ -218,6 +218,10 @@
     def show_error(self, text):
         self.qtiface.showError(text)
 
+    def update_status(self, job):
+        if 'type' in job and job["type"] == "test":
+            self.qtiface.updateAutoTestStatus(job["status"], job["name"])
+
     def wait_on_signals(self, **signals):
         for name, function in signals.iteritems():
             self.bus.add_signal_receiver(function, name)

=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-03-02 15:20:29 +0000
+++ qt/frontend/qtfront.cpp	2012-03-08 17:28:47 +0000
@@ -16,6 +16,14 @@
 Q_DECLARE_METATYPE(myQMap)
 Q_DECLARE_METATYPE(QVariantMap)
 
+#define STATUS_UNINITIATED "uninitiated"
+#define STATUS_FAIL "fail"
+#define STATUS_PASS "pass"
+#define STATUS_UNSUPPORTED "unsupported"
+#define STATUS_UNRESOLVED "unresolved"
+#define STATUS_UNTESTED "untested"
+#define STATUS_INPROGRESS "inprogress"
+
 class CustomQTabWidget : QTabWidget
 {
 public:
@@ -84,13 +92,13 @@
     m_titleTestTypes["__suspend__"] = "Suspend Test";
     m_titleTestTypes["__usb__"] = "USB Test";
 
-    m_statusStrings["uninitiated"] = tr("Not Started");
-    m_statusStrings["pass"] = tr("Done");
-    m_statusStrings["fail"] = tr("Done");
-    m_statusStrings["unsupported"] = tr("Not Supported");
-    m_statusStrings["unresolved"] = tr("Not Resolved");
-    m_statusStrings["untested"] = tr("Not Tested");
-    m_statusStrings["inprogress"] = tr("In Progress");
+    m_statusStrings[STATUS_UNINITIATED] = tr("Not Started");
+    m_statusStrings[STATUS_PASS] = tr("Done");
+    m_statusStrings[STATUS_FAIL] = tr("Done");
+    m_statusStrings[STATUS_UNSUPPORTED] = tr("Not Supported");
+    m_statusStrings[STATUS_UNRESOLVED] = tr("Not Resolved");
+    m_statusStrings[STATUS_UNTESTED] = tr("Not Tested");
+    m_statusStrings[STATUS_INPROGRESS] = tr("In Progress");
 
 }
 
@@ -115,18 +123,17 @@
 
 void QtFront::onYesTestClicked() {
     emit yesTestClicked();
-    updateTestStatus(m_statusStrings["pass"]);
-
+    updateTestStatus(STATUS_PASS);
 }
 
 void QtFront::onNoTestClicked() {
     emit noTestClicked();
-    updateTestStatus(m_statusStrings["fail"]);
+    updateTestStatus(STATUS_FAIL);
 }
 
 void QtFront::onPreviousTestClicked() {
     emit previousTestClicked();
-    updateTestStatus(m_statusStrings["uninitiated"]);
+    updateTestStatus(STATUS_UNINITIATED);
 }
 
 void QtFront::setInitialState()
@@ -161,7 +168,7 @@
     } else {
         emit nextTestClicked();
     }
-    updateTestStatus(m_statusStrings["untested"]);
+    updateTestStatus(STATUS_UNTESTED);
 }
 
 void QtFront::onTabChanged(int index)
@@ -273,7 +280,7 @@
 {
     currentState = TESTING;
     m_currentTestName = testName;
-    updateTestStatus(m_statusStrings["inprogress"]);
+    updateTestStatus(STATUS_INPROGRESS);
     ui->radioTestTab->setVisible(true);
     ui->nextPrevButtons->setVisible(true);
     ui->testTestButton->setEnabled(enableTestButton);
@@ -338,26 +345,26 @@
             updateTestStatus(childItem, status);
         }
         if (childItem->data(Qt::UserRole).toString() == m_currentTestName && !status.isEmpty()) {
-            childItem->setText(status);
+            childItem->setText(m_statusStrings[status]);
         }
-        if (childItem->text() == m_statusStrings["pass"]) {
+        if (childItem->text() == m_statusStrings[STATUS_PASS]) {
             childItem->setData(QVariant(Qt::Checked), Qt::CheckStateRole);
             done++;
-        } else if (childItem->text() == m_statusStrings["inprogress"]) {
+        } else if (childItem->text() == m_statusStrings[STATUS_INPROGRESS]) {
             childItem->setData(QVariant(Qt::Unchecked), Qt::CheckStateRole);
             inprogress++;
-        } else if (childItem->text() == m_statusStrings["uninitiated"]) {
+        } else if (childItem->text() == m_statusStrings[STATUS_UNINITIATED]) {
             childItem->setData(QVariant(Qt::Unchecked), Qt::CheckStateRole);
         }
     }
     if (done == item->rowCount() && done != 0) {
-        item->setText(m_statusStrings["pass"]);
+        item->setText(m_statusStrings[STATUS_PASS]);
         item->setData(QVariant(Qt::Checked), Qt::CheckStateRole);
     } else if (inprogress != 0 || done != 0) {
-        item->setText(m_statusStrings["inprogress"]);
+        item->setText(m_statusStrings[STATUS_INPROGRESS]);
         item->setData(QVariant(Qt::PartiallyChecked), Qt::CheckStateRole);
     } else {
-        item->setText(m_statusStrings["uninitiated"]);
+        item->setText(m_statusStrings[STATUS_UNINITIATED]);
         item->setData(QVariant(Qt::Unchecked), Qt::CheckStateRole);
     }
 }
@@ -368,6 +375,13 @@
     }
 }
 
+void QtFront::updateAutoTestStatus(QString status, QString currentTest) {
+    if (!currentTest.isEmpty()) {
+        m_currentTestName = currentTest;
+    }
+    updateTestStatus(status);
+}
+
 void QtFront::buildTree(QVariantMap options, QString baseIndex, QStandardItem *parentItem, QStandardItem *parentStatusItem)
 {
     int internalIndex = 1;

=== modified file 'qt/frontend/qtfront.h'
--- qt/frontend/qtfront.h	2012-03-02 15:20:29 +0000
+++ qt/frontend/qtfront.h	2012-03-08 17:28:47 +0000
@@ -51,6 +51,7 @@
     QString getEmailAddress();
     void showTest(QString purpose, QString steps, QString verification, QString info, QString testType, QString testName, bool enableTestButton);
     QString showInfo(QString text, QStringList options, QString defaultoption);
+    void updateAutoTestStatus(QString status, QString testName);
 
 private slots:
     void onFullTestsClicked();