Ubuntu
checkbox package

Merge lp://staging/~brendan-donegan/ubuntu/trusty/checkbox/ffe_ui_custom_transport_ubuntu into lp://staging/ubuntu/trusty/checkbox

  1. Trusty (14.04)
  2. ffe_ui_custom_transport_ubuntu
  3. Merge into trusty
Proposed by Brendan Donegan
Status: Merged
Merged at revision: 1994
Proposed branch: lp://staging/~brendan-donegan/ubuntu/trusty/checkbox/ffe_ui_custom_transport_ubuntu
Merge into: lp://staging/ubuntu/trusty/checkbox
Diff against target: 933 lines (+363/-203)
15 files modified
checkbox-gui/checkbox-gui/WhiteListModelFactory.cpp (+10/-9)
checkbox-gui/checkbox-gui/WhiteListModelFactory.h (+1/-1)
checkbox-gui/checkbox-gui/checkbox-gui.pro (+2/-2)
checkbox-gui/checkbox-gui/commandtool.cpp (+0/-15)
checkbox-gui/checkbox-gui/commandtool.h (+0/-40)
checkbox-gui/checkbox-gui/main.cpp (+10/-14)
checkbox-gui/checkbox-gui/qml/SubmissionDialog.qml (+83/-8)
checkbox-gui/checkbox-gui/qml/SuiteSelectionView.qml (+0/-3)
checkbox-gui/checkbox-gui/qml/WelcomeView.qml (+4/-16)
checkbox-gui/checkbox-gui/settings.cpp (+26/-0)
checkbox-gui/checkbox-gui/settings.h (+24/-0)
checkbox-gui/checkbox-gui/testitemmodel.cpp (+1/-1)
checkbox-gui/gui-engine/gui-engine.cpp (+171/-88)
checkbox-gui/gui-engine/gui-engine.h (+20/-6)
debian/changelog (+11/-0)
To merge this branch: bzr merge lp://staging/~brendan-donegan/ubuntu/trusty/checkbox/ffe_ui_custom_transport_ubuntu
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Ubuntu branches Pending
Review via email: mp+214603@code.staging.launchpad.net

Description of the change

* Use select_jobs to ensure whitelist order is preserved (LP: #1213893)
* Use partial_id to avoid showing overly-long, namespaced job names
  (LP: #1297500)
* Enable customization checkbox-gui (LP: #1303849)
* Send test results to Launchpad (LP: #1302615)

To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

I can handle merging this into lp:ubuntu/checkbox. Brendan's code looks OK, although some of the changes for bug 1303849 are a bit extensive, they are not out of scope for the feature described in the bug, and it's arguably riskier to completely refactor that already-tested code into something new.

The packages build and install fine and the client even runs without problems, the only issue I saw was that a "launchpad transport" isn't available, as Brendan mentioned this depends on some plainbox and checkbox-ng packages that need to be synced from debian.

Once those packages are synced and (more importantly) the freeze exceptions are reviewed and hopefully accepted, I'm ready to merge and upload this into lp:ubuntu/checkbox.

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

I'll have a look at the cross-diff between ubuntu, this proposal and trunk

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Spurious change in Changelog

938 -
939 +<F4>

review: Needs Fixing
lp://staging/~brendan-donegan/ubuntu/trusty/checkbox/ffe_ui_custom_transport_ubuntu updated
2003. By Brendan Donegan

Remove spurious <F4> character

Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Diffing this to trunk I see some stuff is missing:

In SubmissionDialog.qml you lack two line changes that compute and pass option_list to GuiExportSessionToFileAsXML()

Is this intentional?

review: Needs Information
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

10:16 <@brendand> zyga, i'm not sure exactly what you mean, but i do know that there was some code that would have passed client_name to that via option_list
10:16 <@brendand> zyga, but roadmr removed it because it would have been another FFe to worry about
10:18 <@zyga> brendand: ok, thanks I was expecting that, just making sure
10:18 <@zyga> brendand: then +1 from me, apart from the <F4> in changelog

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :

Freeze exceptions are approved, so I'll merge this now...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches