Merge lp:~sylvain-pineau/cdts/bug1234674 into lp:cdts

[Sylvain Pineau]

[WORK IN PROGRESS]

a quick and dirty workaround for the linked bug, not fixing the root cause but avoids the SEGFAULT crash.

Unmerged revisions

2318. By Sylvain Pineau on 2013-10-04

ResumeView.qml: Call guiEngine.GuiRestartSession();

In order to refresh PBObjects

2317. By Sylvain Pineau on 2013-10-04

gui-engine: Fix GuiEngine::CreateSession qDebug location

2316. By Sylvain Pineau on 2013-10-04

gui-engine: Adds GuiRestartSession() to the API

To do in one shot:

GuiSessionRemove();
RefreshPBObjects();
GuiCreateSession();

2315. By Sylvain Pineau on 2013-10-01

"automatic merge by tarmac [r=sylvain-pineau][bug=1232171][author=sylvain-pineau]"

2314. By Andrew Haigh on 2013-09-27

"automatic merge by tarmac [r=roadmr][bug=1232171][author=andrew-haigh-b]"

2313. By Sylvain Pineau on 2013-09-26

"automatic merge by tarmac [r=roadmr][bug=1231082][author=sylvain-pineau]"

2312. By Sylvain Pineau on 2013-09-26

"automatic merge by tarmac [r=roadmr][bug=1229192][author=sylvain-pineau]"

2311. By Sylvain Pineau on 2013-09-25

"automatic merge by tarmac [r=zkrynicki,roadmr][bug=1229194][author=sylvain-pineau]"

2310. By Andrew Haigh on 2013-09-24

" The gui now uses the metadata property of the SessionState to preserve its progress as it runs through the tests. This is used to determine whether a resumption of previous test state is possible and gives the user the option of doing so. [r=roadmr][bug=1214896,1229897][author=andrew-haigh-b]"

2309. By Zygmunt Krynicki on 2013-09-23

"automatic merge by tarmac [r=apulido][bug=][author=zkrynicki]"

=== modified file 'plainbox-gui/canonical-driver-test-suite/qml/ResumeView.qml'
--- plainbox-gui/canonical-driver-test-suite/qml/ResumeView.qml	2013-09-23 19:49:56 +0000
+++ plainbox-gui/canonical-driver-test-suite/qml/ResumeView.qml	2013-10-04 12:11:52 +0000
@@ -27,7 +27,6 @@
 Page {
     title: i18n.tr("Resume")
 
-
     Text {
         id: querylabel
         width: parent.width - units.gu(40)
@@ -54,20 +53,16 @@
         }
         property int buttonWidth: parent.width - units.gu(40)
 
-
         Button {
             id: rerunButton
             text: i18n.tr("Rerun last test")
             width: buttoncol.buttonWidth
             color: UbuntuColors.orange
             onClicked: {
-
                 // Prepare for the run
                 guiEngine.GuiResumeSession(true /* re-run last test */);
-
                 // We need this to show the list of stuff
                 testitemFactory.CreateTestListModel(testListModel);
-
                 mainView.state = "RUNMANAGER"
             }
         }
@@ -78,14 +73,10 @@
             width: buttoncol.buttonWidth
             color: UbuntuColors.lightAubergine
             onClicked: {
-
-
                 // Prepare for the run
                 guiEngine.GuiResumeSession(false /* re-run last test */);
-
                 // We need this to show the list of stuff
                 testitemFactory.CreateTestListModel(testListModel);
-
                 mainView.state = "RUNMANAGER"
             }
         }
@@ -96,16 +87,10 @@
             width: buttoncol.buttonWidth
             color: UbuntuColors.warmGrey
             onClicked: {
-
-                // Lets clean up the old session
-                guiEngine.GuiSessionRemove();
-
-        // And create a fresh one
-        guiEngine.GuiCreateSession();
-
+                // Lets clean up the old session and create a fresh one
+                guiEngine.GuiRestartSession();
                 mainView.state = "WELCOME"
             }
         }
     }
-
 }

=== modified file 'plainbox-gui/gui-engine/gui-engine.cpp'
--- plainbox-gui/gui-engine/gui-engine.cpp	2013-09-24 20:39:22 +0000
+++ plainbox-gui/gui-engine/gui-engine.cpp	2013-10-04 12:11:52 +0000
@@ -1224,6 +1224,13 @@
     return previous;
 }
 
+void GuiEngine::GuiRestartSession(void)
+{
+    GuiSessionRemove();
+    RefreshPBObjects();
+    GuiCreateSession();
+}
+
 void GuiEngine::GuiCreateSession(void)
 {
     // Create a session and "seed" it with my job list:
@@ -1294,6 +1301,7 @@
 {
     QDBusObjectPath session;
 
+    qDebug("GuiEngine::CreateSession");
     QDBusInterface iface(PBBusName, \
                          PBObjectPathName, \
                          PBInterfaceName, \
@@ -1428,7 +1436,7 @@
     if (reply.isValid()) {
         job_list = reply.value();
     } else {
-        qDebug("Failed to CreateSession()");
+        qDebug("Failed to UpdateDesiredJobList()");
     }
 
     return job_list;

=== modified file 'plainbox-gui/gui-engine/gui-engine.h'
--- plainbox-gui/gui-engine/gui-engine.h	2013-09-24 20:39:22 +0000
+++ plainbox-gui/gui-engine/gui-engine.h	2013-10-04 12:11:52 +0000
@@ -180,6 +180,7 @@
         // Retrieve all the previous session data
         void GuiResumeSession(const bool re_run);
         void GuiCreateSession(void);
+        void GuiRestartSession(void);
 
 public:
         // Returns a list of all the jobnodes