Merge lp://staging/~zyga/checkbox/checkbox-touch-fixes into lp://staging/checkbox

Proposed by Zygmunt Krynicki
Status: Work in progress
Proposed branch: lp://staging/~zyga/checkbox/checkbox-touch-fixes
Merge into: lp://staging/checkbox
Diff against target: 38 lines (+6/-5)
2 files modified
checkbox-touch/py/checkbox_touch.py (+1/-3)
checkbox-touch/requirements/deb-touch.txt (+5/-2)
To merge this branch: bzr merge lp://staging/~zyga/checkbox/checkbox-touch-fixes
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Review via email: mp+248304@code.staging.launchpad.net

Description of the change

835d8a1 checkbox-touch: sort requirements
32ff640 checkbox-touch: add missing requirements
f4d1107 checkbox-touch:py: remove unused imports
82192fa checkbox-touch:py: remove unused variable

To post a comment you must log in.
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

Good cleanup, +1

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

The attempt to merge lp:~zkrynicki/checkbox/checkbox-touch-fixes into lp:checkbox failed. Below is the output from the failed tests.

[precise] starting container
[precise] (timing) 0.07user 0.00system 0:05.21elapsed 1%CPU (0avgtext+0avgdata 7864maxresident)k
[precise] (timing) 0inputs+32outputs (0major+6061minor)pagefaults 0swaps
[precise] provisioning container
[precise] Unable to provision requirements in container!
[precise] stdout: http://paste.ubuntu.com/10021308/
[precise] stderr: http://paste.ubuntu.com/10021309/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed container to reclaim resources
[trusty] starting container
[trusty] (timing) 0.06user 0.00system 0:04.41elapsed 1%CPU (0avgtext+0avgdata 7868maxresident)k
[trusty] (timing) 0inputs+32outputs (0major+5790minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] Unable to provision requirements in container!
[trusty] stdout: http://paste.ubuntu.com/10021310/
[trusty] stderr: http://paste.ubuntu.com/10021311/
[trusty] NOTE: unable to execute tests, marked as failed
[trusty] Destroying failed container to reclaim resources

Destroying precise-testing failed
Destroying trusty-testing failed

Unmerged revisions

3560. By Zygmunt Krynicki

checkbox-touch:py: remove unused variable

Signed-off-by: Zygmunt Krynicki <email address hidden>

3559. By Zygmunt Krynicki

checkbox-touch:py: remove unused imports

Signed-off-by: Zygmunt Krynicki <email address hidden>

3558. By Zygmunt Krynicki

checkbox-touch: add missing requirements

This patch adds missing dependencies to run 'qmlscene main.qml' natively
on Ubuntu 14.10+, using virtualenv with plainbox.
 - pyotherside
 - qml-module-qtquick-layouts
 - qmlscene

Signed-off-by: Zygmunt Krynicki <email address hidden>

3557. By Zygmunt Krynicki

checkbox-touch: sort requirements

Signed-off-by: Zygmunt Krynicki <email address hidden>

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