Merge lp:~sylvain-pineau/checkbox/937696_update_selection_tree_on_recover into lp:checkbox

[Sylvain Pineau]

The selection tree is now updated when recovering from a previous run, both tests selection and status are updated.

[lp:~sylvain-pineau/checkbox/937696_update_selection_tree_on_recover]

1335. By Sylvain Pineau on 2012-03-21

Fix a previous merge error in qt_interface.py

[Jeff Lane  (bladernr)]

Thanks. Approve... tested this a couple times by launching checkbox-qt and selecting a handful of tests, killing checkbox then restarting. Works well, each recovery shows only the previously selected tests as being selected on subsequent runs.

review: Approve

=== modified file 'checkbox_qt/qt_interface.py'
--- checkbox_qt/qt_interface.py	2012-03-20 19:47:17 +0000
+++ checkbox_qt/qt_interface.py	2012-03-21 09:26:19 +0000
@@ -126,21 +126,27 @@
 
     def show_tree(self, text, options={}, default={}):
         indexedOptions = {}
+        indexedDefaults = {}
 
         def onStartTestsClicked():
             self.direction = NEXT
             self.loop.quit()
 
-        def buildBranch(options, baseIndex="1"):
+        def buildBranch(options, default, baseIndex="1"):
             internalIndex = 1
             for test, state in options.iteritems():
+                active = test in default
                 if isinstance(state, dict):
                     indexedOptions[
                         baseIndex + "." + str(internalIndex)] = {test: ''}
-                    buildBranch(state, baseIndex + "." + str(internalIndex))
+                    indexedDefaults[
+                        baseIndex + "." + str(internalIndex)] = {test: active}
+                    buildBranch(state, default.get(test, {}), baseIndex + "." + str(internalIndex))
                 else:
                     indexedOptions[
                         baseIndex + "." + str(internalIndex)] = {test: state}
+                    indexedDefaults[
+                        baseIndex + "." + str(internalIndex)] = {test: active}
                 internalIndex += 1
 
         def buildDict(options, baseIndex="1"):
@@ -161,9 +167,9 @@
             return branch
 
         self._set_main_title()
-        buildBranch(options)
+        buildBranch(options, default)
 
-        self.qtiface.showTree(text, indexedOptions)
+        self.qtiface.showTree(text, indexedOptions, indexedDefaults)
         self.wait_on_signals(
             startTestsClicked=onStartTestsClicked)
 
@@ -211,7 +217,7 @@
         if not "data" in test:
             test["data"] = ""
         if "command" in test:
-            enableTestButton = True    
+            enableTestButton = True
 
         self.qtiface.showTest(
             test["purpose"], test["steps"], test["verification"], info, test["data"],

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-20 19:57:16 +0000
+++ debian/changelog	2012-03-21 09:26:19 +0000
@@ -62,6 +62,9 @@
     right click menu (LP: #956757)
   * checkbox_qt/qt_interface.py, qt/frontend/qtfront.cpp,
     qt/frontend/qtfront.h: Tests now select Yes on PASS status (LP: #954556)
+  * qt/frontend/qtfront.cpp, qt/frontend/qtfront.h, plugins/suites_prompt.py,
+    checkbox_qt/qt_interface.py, plugins/jobs_prompt.py: The selection tree is
+    now updated when recovering from a previous run (LP: #937696)
 
   [Brendan Donegan]
   * jobs/suspend.txt.in: Fixed dependencies on wireless and suspend_advanced

=== modified file 'plugins/jobs_prompt.py'
--- plugins/jobs_prompt.py	2012-03-01 22:35:44 +0000
+++ plugins/jobs_prompt.py	2012-03-21 09:26:19 +0000
@@ -55,6 +55,7 @@
         self._store = None
 
         for (rt, rh) in [
+             ("expose-msgstore", self.expose_msgstore),
              ("begin-persist", self.begin_persist),
              ("begin-recover", self.begin_recover),
              ("ignore-jobs", self.ignore_jobs),
@@ -72,6 +73,9 @@
         #all other gathering callbacks are finished)
         self._manager.reactor.call_on("gather", self.end_gather, 900)
 
+    def expose_msgstore(self):
+        self._manager.reactor.fire("store-access", self.store)
+
     def begin_persist(self, persist):
         self._persist = persist
 

=== modified file 'plugins/suites_prompt.py'
--- plugins/suites_prompt.py	2012-03-14 21:11:06 +0000
+++ plugins/suites_prompt.py	2012-03-21 09:26:19 +0000
@@ -51,7 +51,8 @@
         for (rt, rh) in [
              ("begin-persist", self.begin_persist),
              ("begin-recover", self.begin_recover),
-             ("report-suite", self.report_suite)]:
+             ("report-suite", self.report_suite),
+             ("store-access", self.store_access)]:
             self._manager.reactor.call_on(rt, rh)
 
         for (rt, rh) in [
@@ -72,6 +73,9 @@
     def report_suite(self, suite):
         suite.setdefault("type", "suite")
 
+    def store_access(self, store):
+        self.store = store
+
     def report_job(self, job):
         if job.get("type") == "suite":
             attribute = "description"
@@ -94,11 +98,21 @@
 
         # Build options
         options = {}
+        self._manager.reactor.fire("expose-msgstore")
+        offset = self.store.get_pending_offset()
+        self.store.set_pending_offset(0)
+        messages = self.store.get_pending_messages()
+        self.store.add_pending_offset(offset)
+        tests = dict([(m["name"], m) for m in messages
+              if m.get("type") in ("test", "metric")])
         for job in resolver.get_dependents():
             suboptions = options
             dependencies = resolver.get_dependencies(job)
             for dependency in dependencies:
-                value = self._statuses.get(dependency, {})
+                if dependency in tests:
+                    value = tests[dependency]["status"]
+                else:
+                    value = self._statuses.get(dependency, {})
                 suboptions = suboptions.setdefault(self._jobs[dependency], value)
 
         # Build defaults

=== modified file 'qt/frontend/qtfront.cpp'
--- qt/frontend/qtfront.cpp	2012-03-20 19:47:17 +0000
+++ qt/frontend/qtfront.cpp	2012-03-21 09:26:19 +0000
@@ -418,27 +418,35 @@
     updateTestStatus(status);
 }
 
-void QtFront::buildTree(QVariantMap options, QString baseIndex, QStandardItem *parentItem, QStandardItem *parentStatusItem)
+void QtFront::buildTree(QVariantMap options, QVariantMap defaults, QString baseIndex, QStandardItem *parentItem, QStandardItem *parentStatusItem)
 {
     int internalIndex = 1;
     while (true) {
         QString index = baseIndex+"."+QString::number(internalIndex);
         QVariant value = options.value(index);
+        QVariant defaultValue = defaults.value(index);
         QDBusArgument arg = value.value<QDBusArgument>();
+        QDBusArgument defaultArg = defaultValue.value<QDBusArgument>();
         if (arg.currentSignature().isEmpty()) {
             break;
         }
         QMap<QString, QString> items = qdbus_cast<QMap<QString, QString> >(arg);
+        QMap<QString, bool> defaultItems = qdbus_cast<QMap<QString, bool> >(defaultArg);
         if (items.isEmpty()) {
             break;
         } else {
             QString test = items.keys().at(0);
             QString status = items.values().at(0);
+            bool active = defaultItems.values().at(0);
             QStandardItem *item = new QStandardItem(test);
             QStandardItem *testStatusItem = new QStandardItem(m_statusStrings[status]);
 
             item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled| Qt::ItemIsTristate);
-            item->setData(QVariant(Qt::Checked), Qt::CheckStateRole);
+            if (active) {
+                item->setData(QVariant(Qt::Checked), Qt::CheckStateRole);
+            } else {
+                item->setData(QVariant(Qt::Unchecked), Qt::CheckStateRole);
+            }
 
             testStatusItem->setData(test, Qt::UserRole);
             testStatusItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled|Qt::ItemIsTristate);
@@ -448,10 +456,10 @@
                 // for children nodes
                 parentItem->appendRow(item);
                 parentStatusItem->appendRow(testStatusItem);
-                buildTree(options, index, item, testStatusItem);
+                buildTree(options, defaults, index, item, testStatusItem);
             } else {
                 // for root nodes
-                buildTree(options, index, item, testStatusItem);
+                buildTree(options, defaults, index, item, testStatusItem);
                 m_model->appendRow(item);
                 m_statusModel->appendRow(testStatusItem);
             }
@@ -460,7 +468,7 @@
     }
 }
 
-void QtFront::showTree(QString text, QVariantMap options)
+void QtFront::showTree(QString text, QVariantMap options, QVariantMap defaults)
 {
     Q_UNUSED(text);
     currentState = TREE;
@@ -471,7 +479,7 @@
     // build the model only once
     if (!this->m_model) {
         this->m_model = new TreeModel();
-        buildTree(options, "1");
+        buildTree(options, defaults, "1");
         ui->treeView->setModel(m_model);
         ui->statusView->setModel(m_statusModel);
     }

=== modified file 'qt/frontend/qtfront.h'
--- qt/frontend/qtfront.h	2012-03-20 19:47:17 +0000
+++ qt/frontend/qtfront.h	2012-03-21 09:26:19 +0000
@@ -46,7 +46,7 @@
     void startProgressBar(QString text);
     void showError(QString text);
     void stopProgressBar();
-    void showTree(QString text, QVariantMap options);
+    void showTree(QString text, QVariantMap options, QVariantMap defaults);
     void showEntry(QString text);
     QVariantMap getTestsToRun();
     QString getEmailAddress();
@@ -90,7 +90,7 @@
 
 private:
     bool registerService();
-    void buildTree(QVariantMap options, QString baseIndex = "1", QStandardItem *parentItem = 0, QStandardItem *parentStatusItem = 0);
+    void buildTree(QVariantMap options, QVariantMap defaults, QString baseIndex = "1", QStandardItem *parentItem = 0, QStandardItem *parentStatusItem = 0);
     void buildTestsToRun(QStandardItem *item, QString baseIndex, QVariantMap &items);
     Ui_main *ui;
     QWidget *m_mainWindow;