Merge lp://staging/~brendan-donegan/cdts/whitelist_ordering into lp://staging/cdts

Proposed by Brendan Donegan
Status: Merged
Approved by: Daniel Manrique
Approved revision: 2364
Merged at revision: 2365
Proposed branch: lp://staging/~brendan-donegan/cdts/whitelist_ordering
Merge into: lp://staging/cdts
Diff against target: 200 lines (+46/-70)
2 files modified
plainbox-gui/gui-engine/gui-engine.cpp (+44/-68)
plainbox-gui/gui-engine/gui-engine.h (+2/-2)
To merge this branch: bzr merge lp://staging/~brendan-donegan/cdts/whitelist_ordering
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Daniel Manrique (community) Needs Fixing
Review via email: mp+212001@code.staging.launchpad.net

Description of the change

This patch implements whitelist ordering, as in ~brendan-donegan/checkbox/gui_whitelist_ordering. See that branch and it's merge proposal for all the details. And make sure the diff matches!

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

The code looks OK, but I ran into some trouble when testing it :(

I merged the code and built a .deb locally, then installed it on a trusty vm, with all up-to-date plainbox/checkbox components. I see the welcome screen, select a test suite (touch), and when clicking "OK" I get a segfault. This happens only with the updated version; c-d-t-s from the ppa works fine.

GuiEngine::RunLocalJobs
Failed to CreateSession()
Segmentation fault (core dumped)

The fault may not be in this code but we need to find out why this happens and fix it anyway before merging this change.

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

I don't think that is caused by this code. I'll approve it for parity with lp:checkbox

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

(Though I agree with you Daniel in principle)

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

The attempt to merge lp:~brendan-donegan/checkbox-ihv-ng/whitelist_ordering into lp:checkbox-ihv-ng failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] (timing) 7.76user 3.72system 3:59.18elapsed 4%CPU (0avgtext+0avgdata 21364maxresident)k
[precise] (timing) 0inputs+184outputs (0major+182822minor)pagefaults 0swaps
[precise] Starting tests...
[precise] PlainBox GUI build: PASS
[precise] (timing) 0.80user 0.36system 1:03.89elapsed 1%CPU (0avgtext+0avgdata 20036maxresident)k
[precise] (timing) 0inputs+72outputs (0major+62002minor)pagefaults 0swaps
[precise] Destroying VM
[trusty] Bringing VM 'up'
[trusty] Unable to 'up' VM!
[trusty] stdout: http://paste.ubuntu.com/7127590/
[trusty] stderr: http://paste.ubuntu.com/7127591/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed VM to reclaim resources
[trusty] Forcing shutdown of VM...
[trusty] Destroying VM and associated drives...

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

I guess we need to sync ihv tree to checkbox a little bit more (dependency
patches)

On Thu, Mar 20, 2014 at 10:58 PM, Daniel Manrique <
<email address hidden>> wrote:

> The proposal to merge
> lp:~brendan-donegan/checkbox-ihv-ng/whitelist_ordering into
> lp:checkbox-ihv-ng has been updated.
>
> Status: Approved => Needs review
>
> For more details, see:
>
> https://code.launchpad.net/~brendan-donegan/checkbox-ihv-ng/whitelist_ordering/+merge/212001
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox-ihv-ng/whitelist_ordering/+merge/212001
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox-ihv-ng/whitelist_ordering into
> lp:checkbox-ihv-ng.
>

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

The attempt to merge lp:~brendan-donegan/checkbox-ihv-ng/whitelist_ordering into lp:checkbox-ihv-ng failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] (timing) 8.48user 3.40system 3:56.35elapsed 5%CPU (0avgtext+0avgdata 21328maxresident)k
[precise] (timing) 0inputs+184outputs (0major+192878minor)pagefaults 0swaps
[precise] Starting tests...
[precise] PlainBox GUI build: PASS
[precise] (timing) 0.85user 0.31system 1:02.15elapsed 1%CPU (0avgtext+0avgdata 19896maxresident)k
[precise] (timing) 0inputs+64outputs (0major+61978minor)pagefaults 0swaps
[precise] Destroying VM
[trusty] Bringing VM 'up'
[trusty] Unable to 'up' VM!
[trusty] stdout: http://paste.ubuntu.com/7130692/
[trusty] stderr: http://paste.ubuntu.com/7130693/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed VM to reclaim resources
[trusty] Forcing shutdown of VM...
[trusty] Destroying VM and associated drives...

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

wrong merging order by tarmac, reapproving

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