Merge lp://staging/~brendan-donegan/checkbox/gui_whitelist_ordering into lp://staging/checkbox

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

Description of the change

This branch implements whitelist ordering in checkbox-gui with the help of the SelectJobs function added to the dbus service interface - which itself returns a set of jobs selected by the provided whitelist, in the order specified in those whitelists.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

8 - JobTreeNode::FilteredJobs(m_final_run_list,m_desired_job_list);
9 + JobTreeNode::FilteredJobs(m_desired_job_list,m_final_run_list);

Sanity check ^^ argument swap is intentional?

+QList<QDBusObjectPath> GuiEngine::GetLocalJobs(QList<QDBusObjectPath> job_list)

I'm not sure (quite rusty on QT) about that but do you intend to copy the whole list of object paths over? Could we pass this as a const reference instead?

review: Needs Information
Revision history for this message
Brendan Donegan (brendan-donegan) wrote :

> 8 - JobTreeNode::FilteredJobs(m_final_run_list,m_desired_job_list);
> 9 + JobTreeNode::FilteredJobs(m_desired_job_list,m_final_run_list);
>
> Sanity check ^^ argument swap is intentional?

100% intentional - as I explained out-of-band, the order of the filtered jobs is determined by the first list passed - m_final_run_list is the users selection, which will follow the order in the UI, so we don't want to use that.

>
> +QList<QDBusObjectPath> GuiEngine::GetLocalJobs(QList<QDBusObjectPath>
> job_list)
>
> I'm not sure (quite rusty on QT) about that but do you intend to copy the
> whole list of object paths over? Could we pass this as a const reference
> instead?

No good point, this could definitely be const &

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

Nice, thanks, +1

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

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

[precise] Bringing VM 'up'
[precise] (timing) 8.23user 3.89system 4:07.64elapsed 4%CPU (0avgtext+0avgdata 21040maxresident)k
[precise] (timing) 8inputs+192outputs (1major+184326minor)pagefaults 0swaps
[precise] Starting tests...
[precise] Checkbox GUI build: PASS
[precise] (timing) 0.88user 0.33system 1:02.45elapsed 1%CPU (0avgtext+0avgdata 20548maxresident)k
[precise] (timing) 8inputs+80outputs (0major+61811minor)pagefaults 0swaps
[precise] CheckBox test suite: PASS
[precise] (timing) 1.14user 0.50system 0:39.36elapsed 4%CPU (0avgtext+0avgdata 20520maxresident)k
[precise] (timing) 5408inputs+56outputs (69major+61056minor)pagefaults 0swaps
[precise] (timing) 0.78user 0.35system 0:05.90elapsed 19%CPU (0avgtext+0avgdata 20136maxresident)k
[precise] (timing) 0inputs+16outputs (0major+62045minor)pagefaults 0swaps
[precise] PlainBox test suite: PASS
[precise] (timing) 1.24user 0.30system 0:19.08elapsed 8%CPU (0avgtext+0avgdata 19996maxresident)k
[precise] (timing) 0inputs+440outputs (0major+62230minor)pagefaults 0swaps
[precise] PlainBox documentation build: PASS
[precise] (timing) 0.95user 0.32system 0:34.34elapsed 3%CPU (0avgtext+0avgdata 20504maxresident)k
[precise] (timing) 0inputs+32outputs (0major+61182minor)pagefaults 0swaps
[precise] CheckBoxNG test suite: PASS
[precise] (timing) 0.93user 0.36system 0:07.68elapsed 16%CPU (0avgtext+0avgdata 20024maxresident)k
[precise] (timing) 1328inputs+16outputs (11major+61918minor)pagefaults 0swaps
[precise] Integration tests: PASS
[precise] (timing) 0.84user 0.35system 0:09.72elapsed 12%CPU (0avgtext+0avgdata 20584maxresident)k
[precise] (timing) 0inputs+8outputs (0major+61650minor)pagefaults 0swaps
[precise] Destroying VM
[trusty] Bringing VM 'up'
[trusty] Unable to 'up' VM!
[trusty] stdout: http://paste.ubuntu.com/7113552/
[trusty] stderr: http://paste.ubuntu.com/7113553/
[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 :

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

[precise] Bringing VM 'up'
[precise] (timing) 7.94user 3.50system 3:55.88elapsed 4%CPU (0avgtext+0avgdata 20964maxresident)k
[precise] (timing) 0inputs+240outputs (0major+182270minor)pagefaults 0swaps
[precise] Starting tests...
[precise] Checkbox GUI build: PASS
[precise] (timing) 0.86user 0.32system 1:01.27elapsed 1%CPU (0avgtext+0avgdata 20288maxresident)k
[precise] (timing) 0inputs+64outputs (0major+60998minor)pagefaults 0swaps
[precise] CheckBox test suite: PASS
[precise] (timing) 0.86user 0.39system 0:38.34elapsed 3%CPU (0avgtext+0avgdata 20740maxresident)k
[precise] (timing) 0inputs+40outputs (0major+61752minor)pagefaults 0swaps
[precise] (timing) 0.84user 0.34system 0:05.98elapsed 19%CPU (0avgtext+0avgdata 20708maxresident)k
[precise] (timing) 0inputs+16outputs (0major+61806minor)pagefaults 0swaps
[precise] PlainBox test suite: PASS
[precise] (timing) 1.16user 0.44system 0:18.86elapsed 8%CPU (0avgtext+0avgdata 20484maxresident)k
[precise] (timing) 0inputs+440outputs (0major+61948minor)pagefaults 0swaps
[precise] PlainBox documentation build: PASS
[precise] (timing) 0.90user 0.33system 0:34.48elapsed 3%CPU (0avgtext+0avgdata 19888maxresident)k
[precise] (timing) 0inputs+32outputs (0major+61534minor)pagefaults 0swaps
[precise] CheckBoxNG test suite: PASS
[precise] (timing) 0.92user 0.36system 0:07.54elapsed 17%CPU (0avgtext+0avgdata 20288maxresident)k
[precise] (timing) 0inputs+16outputs (0major+61973minor)pagefaults 0swaps
[precise] Integration tests: PASS
[precise] (timing) 0.78user 0.35system 0:09.49elapsed 11%CPU (0avgtext+0avgdata 20252maxresident)k
[precise] (timing) 0inputs+8outputs (0major+61974minor)pagefaults 0swaps
[precise] Destroying VM
[trusty] Bringing VM 'up'
[trusty] Unable to 'up' VM!
[trusty] stdout: http://paste.ubuntu.com/7113670/
[trusty] stderr: http://paste.ubuntu.com/7113671/
[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...

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