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

Proposed by Brendan Donegan
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 2883
Merged at revision: 2887
Proposed branch: lp://staging/~brendan-donegan/checkbox/fix_setup_develop
Merge into: lp://staging/checkbox
Diff against target: 27 lines (+4/-3)
2 files modified
checkbox-ng/setup.py (+1/-0)
support/develop-projects (+3/-3)
To merge this branch: bzr merge lp://staging/~brendan-donegan/checkbox/fix_setup_develop
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+214258@code.staging.launchpad.net

Description of the change

checkbox-ng now depends on checkbox-support. We need to make sure checkbox-support is ready for checkbox-ng and that checkbox-ng explicitly specifies the dependency.

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

+1

review: Approve
Revision history for this message
Daniel Manrique (roadmr) wrote :
Download full text (3.7 KiB)

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

[precise] Bringing VM 'up'
[precise] (timing) 8.12user 3.37system 4:02.71elapsed 4%CPU (0avgtext+0avgdata 22080maxresident)k
[precise] (timing) 0inputs+192outputs (0major+182879minor)pagefaults 0swaps
[precise] Starting tests...
[precise] Checkbox GUI build: PASS
[precise] (timing) 0.84user 0.35system 1:03.46elapsed 1%CPU (0avgtext+0avgdata 20152maxresident)k
[precise] (timing) 0inputs+80outputs (0major+61901minor)pagefaults 0swaps
[precise] (timing) 0.81user 0.30system 0:05.84elapsed 19%CPU (0avgtext+0avgdata 20504maxresident)k
[precise] (timing) 0inputs+8outputs (0major+61745minor)pagefaults 0swaps
[precise] PlainBox test suite: FAIL
[precise] stdout: http://paste.ubuntu.com/7203511/
[precise] stderr: http://paste.ubuntu.com/7203512/
[precise] (timing) Command exited with non-zero status 1
[precise] (timing) 1.03user 0.40system 0:19.69elapsed 7%CPU (0avgtext+0avgdata 19892maxresident)k
[precise] (timing) 0inputs+288outputs (0major+61453minor)pagefaults 0swaps
[precise] PlainBox documentation build: PASS
[precise] (timing) 0.92user 0.41system 0:35.05elapsed 3%CPU (0avgtext+0avgdata 20596maxresident)k
[precise] (timing) 0inputs+32outputs (0major+61815minor)pagefaults 0swaps
[precise] CheckBoxNG test suite: PASS
[precise] (timing) 0.82user 0.32system 0:11.63elapsed 9%CPU (0avgtext+0avgdata 20028maxresident)k
[precise] (timing) 0inputs+16outputs (0major+62140minor)pagefaults 0swaps
[precise] Integration tests: PASS
[precise] (timing) 0.79user 0.36system 0:08.36elapsed 13%CPU (0avgtext+0avgdata 20124maxresident)k
[precise] (timing) 0inputs+8outputs (0major+61439minor)pagefaults 0swaps
[precise] Resource provider: PASS
[precise] (timing) 0.84user 0.32system 0:05.87elapsed 19%CPU (0avgtext+0avgdata 20016maxresident)k
[precise] (timing) 0inputs+8outputs (0major+61723minor)pagefaults 0swaps
[precise] Destroying VM
[trusty] Bringing VM 'up'
[trusty] (timing) 10.20user 4.68system 5:20.46elapsed 4%CPU (0avgtext+0avgdata 22044maxresident)k
[trusty] (timing) 0inputs+288outputs (0major+268107minor)pagefaults 0swaps
[trusty] Starting tests...
[trusty] Checkbox GUI build: PASS
[trusty] (timing) 0.80user 0.36system 1:17.44elapsed 1%CPU (0avgtext+0avgdata 20032maxresident)k
[trusty] (timing) 0inputs+80outputs (0major+60390minor)pagefaults 0swaps
[trusty] (timing) 2.12user 1.14system 0:10.16elapsed 32%CPU (0avgtext+0avgdata 20304maxresident)k
[trusty] (timing) 320inputs+8outputs (2major+59705minor)pagefaults 0swaps
[trusty] PlainBox test suite: PASS
[trusty] (timing) 1.08user 0.35system 0:23.56elapsed 6%CPU (0avgtext+0avgdata 19872maxresident)k
[trusty] (timing) 216inputs+248outputs (1major+60166minor)pagefaults 0swaps
[trusty] PlainBox documentation build: PASS
[trusty] (timing) 0.86user 0.33system 0:37.85elapsed 3%CPU (0avgtext+0avgdata 20148maxresident)k
[trusty] (timing) 0inputs+32outputs (0major+59820minor)pagefaults 0swaps
[trusty] CheckBoxNG test suite: PASS
[trusty] (timing) 0.76u...

Read more...

Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

I guess that we'll need the same sort of dependency at Debian packaging level.

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

Ohhh

So now we need proper pyparsing in external tarballs OR a proper entry to
requirements/ in checkbox-support. EDIT: 12.04 doesn't have pyparsing 2.0
so we need a tarball.

On Fri, Apr 4, 2014 at 4:50 PM, Sylvain Pineau <<email address hidden>
> wrote:

> I guess that we'll need the same sort of dependency at Debian packaging
> level.
> --
>
> https://code.launchpad.net/~brendan-donegan/checkbox/fix_setup_develop/+merge/214258
> You are reviewing the proposed merge of
> lp:~brendan-donegan/checkbox/fix_setup_develop into lp:checkbox.
>

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