Checkbox

Merge lp://qastaging/~kissiel/checkbox/qml-native into lp://qastaging/checkbox

  1. qml-native
  2. Merge into trunk
Proposed by Maciej Kisielewski
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 3556
Merged at revision: 3554
Proposed branch: lp://qastaging/~kissiel/checkbox/qml-native
Merge into: lp://qastaging/checkbox
Diff against target: 1669 lines (+1324/-7)
29 files modified
cep/CEP-5.txt (+87/-0)
checkbox-touch/components/QmlNativePage.qml (+133/-0)
checkbox-touch/main.qml (+14/-0)
checkbox-touch/py/checkbox_touch.py (+1/-0)
plainbox/docs/conf.py (+2/-0)
plainbox/docs/manpages/plainbox-job-units.rst (+3/-0)
plainbox/docs/manpages/plainbox-qml-shell.rst (+18/-0)
plainbox/plainbox/data/qml-shell/pipe_handler.py (+42/-0)
plainbox/plainbox/data/qml-shell/plainbox_qml_shell.qml (+111/-0)
plainbox/plainbox/impl/ctrl.py (+157/-0)
plainbox/plainbox/impl/providers/stubbox/data/qml-navigation.qml (+68/-0)
plainbox/plainbox/impl/providers/stubbox/data/qml-simple.qml (+40/-0)
plainbox/plainbox/impl/providers/stubbox/units/jobs/categories.pxu (+4/-0)
plainbox/plainbox/impl/providers/stubbox/units/jobs/stub.pxu (+22/-0)
plainbox/plainbox/impl/runner.py (+73/-0)
plainbox/plainbox/impl/test_ctrl.py (+108/-0)
plainbox/plainbox/impl/unit/job.py (+39/-3)
plainbox/plainbox/impl/unit/test_job.py (+38/-2)
plainbox/plainbox/qml_shell/qml_shell.py (+141/-0)
plainbox/plainbox/qml_shell/qml_shell.qml (+75/-0)
plainbox/plainbox/test_provider_manager.py (+1/-1)
plainbox/setup.py (+1/-0)
providers/2015.com.canonical.certification:qml-tests/.bzrignore (+2/-0)
providers/2015.com.canonical.certification:qml-tests/.gitignore (+2/-0)
providers/2015.com.canonical.certification:qml-tests/README.md (+5/-0)
providers/2015.com.canonical.certification:qml-tests/data/camera-test.qml (+101/-0)
providers/2015.com.canonical.certification:qml-tests/manage.py (+21/-0)
providers/2015.com.canonical.certification:qml-tests/units/qml-tests.pxu (+14/-0)
support/develop-providers (+1/-1)
To merge this branch: bzr merge lp://qastaging/~kissiel/checkbox/qml-native
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+247960@code.qastaging.launchpad.net

Description of the change

This MR includes same changes as https://code.launchpad.net/~kissiel/checkbox/qml-native-test/+merge/247759, but has completely rewrittenhistory for more clarity.

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

16:35 <@zyga> kissiel: love the man page
16:35 <@zyga> kissiel: let's merge it
16:35 < kissiel> zyga, \o/
16:36 <@zyga> kissiel: thanks for doing all the work and for iterating :)

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

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

[precise] starting container
[precise] (timing) 0.06user 0.01system 0:04.18elapsed 1%CPU (0avgtext+0avgdata 7864maxresident)k
[precise] (timing) 0inputs+32outputs (0major+5788minor)pagefaults 0swaps
[precise] provisioning container
[precise] (timing) 36.91user 10.70system 1:19.85elapsed 59%CPU (0avgtext+0avgdata 51680maxresident)k
[precise] (timing) 0inputs+16408outputs (0major+4472567minor)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: PASS
[precise-testing] (timing) 33.14user 2.50system 0:36.09elapsed 98%CPU (0avgtext+0avgdata 116468maxresident)k
[precise-testing] (timing) 0inputs+4216outputs (0major+477769minor)pagefaults 0swaps
Found a test script: ./checkbox-ng/requirements/container-tests-checkbox-ng-unit
[precise-testing] container-tests-checkbox-ng-unit: PASS
[precise-testing] (timing) 0.56user 0.11system 0:01.43elapsed 46%CPU (0avgtext+0avgdata 39924maxresident)k
[precise-testing] (timing) 0inputs+3480outputs (0major+20653minor)pagefaults 0swaps
Found a test script: ./checkbox-support/requirements/container-tests-checkbox-support
[precise-testing] container-tests-checkbox-support: PASS
[precise-testing] (timing) 16.92user 0.16system 0:17.20elapsed 99%CPU (0avgtext+0avgdata 83492maxresident)k
[precise-testing] (timing) 0inputs+1032outputs (0major+28807minor)pagefaults 0swaps
Found a test script: ./checkbox-touch/requirements/container-tests-touch-unit-tests
[precise-testing] container-tests-touch-unit-tests: PASS
[precise-testing] (timing) 0.00user 0.00system 0:00.01elapsed 42%CPU (0avgtext+0avgdata 2020maxresident)k
[precise-testing] (timing) 0inputs+8outputs (0major+2346minor)pagefaults 0swaps
Found a test script: ./plainbox/plainbox/impl/providers/categories/requirements/container-tests-provider-categories
[precise-testing] container-tests-provider-categories: PASS
[precise-testing] (timing) 0.14user 0.05system 0:00.20elapsed 92%CPU (0avgtext+0avgdata 13520maxresident)k
[precise-testing] (timing) 0inputs+176outputs (0major+5874minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/001-container-tests-plainbox-egg-info
[precise-testing] 001-container-tests-plainbox-egg-info: PASS
[precise-testing] (timing) 0.15user 0.03system 0:00.19elapsed 93%CPU (0avgtext+0avgdata 10520maxresident)k
[precise-testing] (timing) 0inputs+88outputs (0major+4989minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox
[precise-testing] container-tests-plainbox: PASS
[precise-testing] (timing) 10.64user 0.72system 0:11.57elapsed 98%CPU (0avgtext+0avgdata 66500maxresident)k
[precise-testing] (timing) 0inputs+2776outputs (0major+103963minor)pagefaults 0swaps
Found a test script: ./plainbox/requirements/container-tests-plainbox-documentation
[precise-testing] container-tests-plainbox-documentation: FAIL
[precise-testing] stdout: http://...

lp://qastaging/~kissiel/checkbox/qml-native updated
3553. By Maciej Kisielewski

plainbox:qml_shell: add standalone qml-native shell

This patch adds standalone qml-shell that can be run without a need to run
'plainbox run (...)', which would require provider to be created and loaded.

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

3554. By Maciej Kisielewski

plainbox:doc: add manpage for plainbox-qml-shell

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

3555. By Maciej Kisielewski

plainbox: add plainbox-qml-shell to setup.py

This patch adds plainbox-qml-shell to console_scripts in setup.py

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

3556. By Maciej Kisielewski

providers: add qml-tests provider

This patch adds provider with qml-native jobs. At start there is only one test
- camera test that shows feed from camera attached to the system. The provider
  is added to venv.

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

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

FYI:

23:25 < kissiel> zyga, omg
23:25 < kissiel> zyga, i found the problem
23:25 < kissiel> zyga, uncommitted __init__
23:25 < kissiel> in qml_shell module...
23:25 < kissiel> which isn't a module :D
23:26 <@zyga> kissiel: ah
23:26 <@zyga> kissiel: well, python3.4 doesn't need init
23:26 <@zyga> kissiel: so it works there
23:27 < kissiel> zyga, right :)
23:27 <@zyga> kissiel: in 3.2 you still need (even empty) __init__.py

review: Approve

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