Merge into trunk : checkbox-touch-cleanup : Code : Checkbox

Status:	Merged
Approved by:	Sylvain Pineau on 2015-06-24
Approved revision:	3826
Merged at revision:	3856
Proposed branch:	lp://qastaging/~kissiel/checkbox/checkbox-touch-cleanup
Merge into:	lp://qastaging/checkbox
Diff against target:	507 lines (+0/-477) 5 files modified checkbox-touch/components/HelloComponent.qml (+0/-15) checkbox-touch/components/ScreensPreviewPage.qml (+0/-237) checkbox-touch/preview.qml (+0/-65) checkbox-touch/py/checkbox_touch.py (+0/-110) checkbox-touch/tests/unit/tst_hellocomponent.qml (+0/-50)
To merge this branch:	bzr merge lp://qastaging/~kissiel/checkbox/checkbox-touch-cleanup
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Sylvain Pineau (community)		Approve on 2015-06-24
Zygmunt Krynicki (community)	2015-05-29	Approve on 2015-06-02
Review via email: mp+260582@code.qastaging.launchpad.net

Description of the change

This MR removes some unused bits from the Checkbox-Touch.

6827eae checkbox-touch: remove FakeCheckboxTouchApplication
2d4d959 checkbox-touch: remove HelloComponent
8504c0f checkbox-touch: remove screens preview page

Revision history for this message

Zygmunt Krynicki (zyga) wrote on 2015-06-02:

#

+1, thanks

review: Approve

Revision history for this message

Daniel Manrique (roadmr) wrote on 2015-06-02:

#

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in checkbox-touch/py/checkbox_touch.py

Revision history for this message

Maciej Kisielewski (kissiel) wrote on 2015-06-05:

#

Self-approving, as the only change after Zygmunt's review was a simple rebase.

Revision history for this message

Daniel Manrique (roadmr) wrote on 2015-06-05:

#

Download full text (12.1 KiB)

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

[precise] starting container
[precise] (timing) 0.06user 0.01system 0:05.22elapsed 1%CPU (0avgtext+0avgdata 7848maxresident)k
[precise] (timing) 0inputs+32outputs (0major+7529minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 46.65user 14.74system 1:39.52elapsed 61%CPU (0avgtext+0avgdata 52404maxresident)k
[precise] (timing) 0inputs+19176outputs (0major+6475307minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-gui/requirements/container-tests-checkbox-gui-build
[precise-testing] container-tests-checkbox-gui-build: [32;1mPASS[39;0m
[precise-testing] (timing) 28.25user 2.14system 0:30.71elapsed 98%CPU (0avgtext+0avgdata 116644maxresident)k
[precise-testing] (timing) 0inputs+4264outputs (0major+478500minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: [32;1mPASS[39;0m
[precise-testing] (timing) 0.64user 0.14system 0:00.83elapsed 94%CPU (0avgtext+0avgdata 42864maxresident)k
[precise-testing] (timing) 0inputs+1528outputs (0major+21620minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: [32;1mPASS[39;0m
[precise-testing] (timing) 16.97user 0.16system 0:17.61elapsed 97%CPU (0avgtext+0avgdata 84236maxresident)k
[precise-testing] (timing) 0inputs+1312outputs (0major+31841minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: [32;1mPASS[39;0m
[precise-testing] (timing) 0.00user 0.00system 0:00.03elapsed 53%CPU (0avgtext+0avgdata 2044maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2383minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: [32;1mPASS[39;0m
[precise-testing] (timing) 1.34user 0.09system 0:01.47elapsed 97%CPU (0avgtext+0avgdata 49672maxresident)k
[precise-testing] (timing) 0inputs+40outputs (0major+15020minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: [32;1mPASS[39;0m
[precise-testing] (timing) 0.15user 0.03system 0:00.20elapsed 92%CPU (0avgtext+0avgdata 10588maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+5046minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: [32;1mPASS[39;0m
[precise-testing] (timing) 32.86user 1.26system 0:34.46elapsed 99%CPU (0avgtext+0avgdata 134856maxresident)k
[precise-testing] (timing) 0inputs+3016outputs (0major+161950minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: [32;1mPASS[39;0m
[precise-testing] (t...

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

[precise] starting container
[precise] (timing) 0.06user 0.01system 0:05.22elapsed 1%CPU (0avgtext+0avgdata 7848maxresident)k
[precise] (timing) 0inputs+32outputs (0major+7529minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 46.65user 14.74system 1:39.52elapsed 61%CPU (0avgtext+0avgdata 52404maxresident)k
[precise] (timing) 0inputs+19176outputs (0major+6475307minor)pagefaults 0swaps
[precise-testing] Starting tests...
Found a test script: ./checkbox-gui/requirements/container-tests-checkbox-gui-build
[precise-testing] container-tests-checkbox-gui-build: [32;1mPASS[39;0m
[precise-testing] (timing) 28.25user 2.14system 0:30.71elapsed 98%CPU (0avgtext+0avgdata 116644maxresident)k
[precise-testing] (timing) 0inputs+4264outputs (0major+478500minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: [32;1mPASS[39;0m
[precise-testing] (timing) 0.64user 0.14system 0:00.83elapsed 94%CPU (0avgtext+0avgdata 42864maxresident)k
[precise-testing] (timing) 0inputs+1528outputs (0major+21620minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: [32;1mPASS[39;0m
[precise-testing] (timing) 16.97user 0.16system 0:17.61elapsed 97%CPU (0avgtext+0avgdata 84236maxresident)k
[precise-testing] (timing) 0inputs+1312outputs (0major+31841minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: [32;1mPASS[39;0m
[precise-testing] (timing) 0.00user 0.00system 0:00.03elapsed 53%CPU (0avgtext+0avgdata 2044maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2383minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: [32;1mPASS[39;0m
[precise-testing] (timing) 1.34user 0.09system 0:01.47elapsed 97%CPU (0avgtext+0avgdata 49672maxresident)k
[precise-testing] (timing) 0inputs+40outputs (0major+15020minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: [32;1mPASS[39;0m
[precise-testing] (timing) 0.15user 0.03system 0:00.20elapsed 92%CPU (0avgtext+0avgdata 10588maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+5046minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: [32;1mPASS[39;0m
[precise-testing] (timing) 32.86user 1.26system 0:34.46elapsed 99%CPU (0avgtext+0avgdata 134856maxresident)k
[precise-testing] (timing) 0inputs+3016outputs (0major+161950minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: [32;1mPASS[39;0m
[precise-testing] (timing) 39.38user 0.66system 0:43.22elapsed 92%CPU (0avgtext+0avgdata 103920maxresident)k
[precise-testing] (timing) 0inputs+40048outputs (0major+41876minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[precise-testing] container-tests-plainbox-integration: [32;1mPASS[39;0m
[precise-testing] (timing) 0.53user 0.08system 0:00.66elapsed 93%CPU (0avgtext+0avgdata 28608maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+22366minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-certification-client/requirements/container-tests-provider-certification-client
[precise-testing] container-tests-provider-certification-client: [32;1mPASS[39;0m
[precise-testing] (timing) 6.25user 0.13system 0:06.43elapsed 99%CPU (0avgtext+0avgdata 71300maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+20450minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-certification-server/requirements/container-tests-provider-certification-server
[precise-testing] container-tests-provider-certification-server: [32;1mPASS[39;0m
[precise-testing] (timing) 2.09user 0.13system 0:02.25elapsed 98%CPU (0avgtext+0avgdata 50292maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+15158minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-checkbox/requirements/container-tests-provider-checkbox
[precise-testing] container-tests-provider-checkbox: [32;1mPASS[39;0m
[precise-testing] (timing) 4.40user 0.12system 0:04.57elapsed 98%CPU (0avgtext+0avgdata 56980maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+16893minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-piglit/requirements/container-tests-provider-piglit
[precise-testing] container-tests-provider-piglit: [32;1mPASS[39;0m
[precise-testing] (timing) 1.38user 0.10system 0:01.51elapsed 98%CPU (0avgtext+0avgdata 49640maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+15042minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-resource-generic/requirements/container-tests-provider-resource-generic
[precise-testing] container-tests-provider-resource-generic: [32;1mPASS[39;0m
[precise-testing] (timing) 1.39user 0.12system 0:01.53elapsed 98%CPU (0avgtext+0avgdata 49732maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+15047minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-ubuntu-touch/requirements/container-tests-provider-certification-touch
[precise-testing] container-tests-provider-certification-touch: [32;1mPASS[39;0m
[precise-testing] (timing) 2.11user 0.10system 0:02.24elapsed 98%CPU (0avgtext+0avgdata 52240maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+15699minor)pagefaults 0swaps
[precise-testing] Fixing file permissions in source directory
[precise-testing] Destroying container
[trusty] starting container
[trusty] (timing) 0.06user 0.01system 0:05.25elapsed 1%CPU (0avgtext+0avgdata 7848maxresident)k
[trusty] (timing) 0inputs+32outputs (0major+7508minor)pagefaults 0swaps
[trusty] provisioning container
[trusty] (timing) 72.42user 19.09system 2:08.86elapsed 71%CPU (0avgtext+0avgdata 60984maxresident)k
[trusty] (timing) 0inputs+2768outputs (0major+7908293minor)pagefaults 0swaps
[trusty-testing] Starting tests...
Found a test script: ./checkbox-gui/requirements/container-tests-checkbox-gui-build
[trusty-testing] container-tests-checkbox-gui-build: [32;1mPASS[39;0m
[trusty-testing] (timing) 35.58user 2.55system 0:39.65elapsed 96%CPU (0avgtext+0avgdata 127944maxresident)k
[trusty-testing] (timing) 0inputs+5248outputs (0major+503797minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[trusty-testing] container-tests-checkbox-ng-unit: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.87user 0.09system 0:00.99elapsed 97%CPU (0avgtext+0avgdata 27984maxresident)k
[trusty-testing] (timing) 0inputs+1208outputs (0major+20283minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[trusty-testing] container-tests-checkbox-support: [32;1mPASS[39;0m
[trusty-testing] (timing) 19.32user 0.19system 0:19.68elapsed 99%CPU (0avgtext+0avgdata 63036maxresident)k
[trusty-testing] (timing) 0inputs+1056outputs (0major+25146minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[trusty-testing] container-tests-touch-unit-tests: [31;1mFAIL[39;0m
[trusty-testing] stdout: http://paste.ubuntu.com/11590213/
[trusty-testing] stderr: 
[trusty-testing] (timing) Command exited with non-zero status 2
[trusty-testing] (timing) 0.59user 0.08system 0:00.80elapsed 84%CPU (0avgtext+0avgdata 27944maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+19069minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[trusty-testing] container-tests-provider-categories: [32;1mPASS[39;0m
[trusty-testing] (timing) 1.74user 0.03system 0:01.80elapsed 98%CPU (0avgtext+0avgdata 28760maxresident)k
[trusty-testing] (timing) 0inputs+32outputs (0major+9791minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[trusty-testing] 001-container-tests-plainbox-egg-info: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.36user 0.04system 0:00.43elapsed 94%CPU (0avgtext+0avgdata 12120maxresident)k
[trusty-testing] (timing) 0inputs+88outputs (0major+7788minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[trusty-testing] container-tests-plainbox: [32;1mPASS[39;0m
[trusty-testing] (timing) 37.09user 1.12system 0:38.98elapsed 98%CPU (0avgtext+0avgdata 85008maxresident)k
[trusty-testing] (timing) 0inputs+2472outputs (0major+125109minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[trusty-testing] container-tests-plainbox-documentation: [32;1mPASS[39;0m
[trusty-testing] (timing) 29.34user 0.34system 0:30.22elapsed 98%CPU (0avgtext+0avgdata 61844maxresident)k
[trusty-testing] (timing) 0inputs+36104outputs (0major+25009minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-integration
[trusty-testing] container-tests-plainbox-integration: [32;1mPASS[39;0m
[trusty-testing] (timing) 0.83user 0.08system 0:00.96elapsed 94%CPU (0avgtext+0avgdata 22148maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+17633minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-certification-client/requirements/container-tests-provider-certification-client
[trusty-testing] container-tests-provider-certification-client: [32;1mPASS[39;0m
[trusty-testing] (timing) 8.48user 0.08system 0:08.63elapsed 99%CPU (0avgtext+0avgdata 41000maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+12998minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-certification-server/requirements/container-tests-provider-certification-server
[trusty-testing] container-tests-provider-certification-server: [32;1mPASS[39;0m
[trusty-testing] (timing) 2.60user 0.06system 0:02.68elapsed 99%CPU (0avgtext+0avgdata 29008maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+9780minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-checkbox/requirements/container-tests-provider-checkbox
[trusty-testing] container-tests-provider-checkbox: [32;1mPASS[39;0m
[trusty-testing] (timing) 4.93user 0.08system 0:05.05elapsed 99%CPU (0avgtext+0avgdata 31736maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+10611minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-piglit/requirements/container-tests-provider-piglit
[trusty-testing] container-tests-provider-piglit: [32;1mPASS[39;0m
[trusty-testing] (timing) 1.50user 0.08system 0:01.62elapsed 98%CPU (0avgtext+0avgdata 28756maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+9813minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-resource-generic/requirements/container-tests-provider-resource-generic
[trusty-testing] container-tests-provider-resource-generic: [32;1mPASS[39;0m
[trusty-testing] (timing) 1.94user 0.06system 0:02.03elapsed 98%CPU (0avgtext+0avgdata 28860maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+9821minor)pagefaults 0swaps
Found a test script: ./providers/plainbox-provider-ubuntu-touch/requirements/container-tests-provider-certification-touch
[trusty-testing] container-tests-provider-certification-touch: [32;1mPASS[39;0m
[trusty-testing] (timing) 2.26user 0.03system 0:02.32elapsed 99%CPU (0avgtext+0avgdata 29944maxresident)k
[trusty-testing] (timing) 0inputs+8outputs (0major+10051minor)pagefaults 0swaps
[trusty-testing] Fixing file permissions in source directory
[trusty-testing] Destroying container

precise-testing doesn't exist
You are trying to send an empty document, exiting.
trusty-testing doesn't exist

lp://qastaging/~kissiel/checkbox/checkbox-touch-cleanup updated on 2015-06-08

3825. By Maciej Kisielewski on 2015-06-08

checkbox-touch: remove HelloComponent

This patch removes boilerplate component that was generated by SDK's wizard.
It's about time :)

Signed-off-by: Maciej Kisielewski <email address hidden>

3826. By Maciej Kisielewski on 2015-06-08

checkbox-touch: remove screens preview page

This patch removes 'alternative' way of lunching the app, where user could see
individual components. This component - ScreensPreviewPage got stale and no one
used it, so this commit ends its existance.

Signed-off-by: Maciej Kisielewski <email address hidden>

Revision history for this message

Sylvain Pineau (sylvain-pineau) wrote on 2015-06-24:

#

+1

review: Approve

Checkbox

Merge lp://qastaging/~kissiel/checkbox/checkbox-touch-cleanup into lp://qastaging/checkbox

Commit message

Description of the change

Preview Diff

Subscribers