Checkbox

Merge lp://qastaging/~kissiel/checkbox/story-1241 into lp://qastaging/checkbox

  1. story-1241
  2. Merge into trunk
Proposed by Maciej Kisielewski
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 3600
Merged at revision: 3616
Proposed branch: lp://qastaging/~kissiel/checkbox/story-1241
Merge into: lp://qastaging/checkbox
Diff against target: 520 lines (+312/-17)
13 files modified
.bzrignore (+6/-0)
.gitignore (+2/-0)
checkbox-touch/build-me (+24/-0)
checkbox-touch/checkbox-touch.desktop (+0/-8)
checkbox-touch/components/CheckboxTouchApplication.qml (+3/-0)
checkbox-touch/components/QmlNativePage.qml (+7/-2)
checkbox-touch/py/checkbox_touch.py (+2/-1)
plainbox/plainbox/data/qml-shell/plainbox_qml_shell.qml (+10/-3)
plainbox/plainbox/impl/ctrl.py (+5/-2)
plainbox/plainbox/impl/test_ctrl.py (+8/-1)
plainbox/plainbox/qml_shell/qml_shell.qml (+16/-0)
providers/2015.com.canonical.certification:qml-tests/data/camera-06.qml (+223/-0)
providers/2015.com.canonical.certification:qml-tests/units/qml-tests.pxu (+6/-0)
To merge this branch: bzr merge lp://qastaging/~kissiel/checkbox/story-1241
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Zygmunt Krynicki (community) Needs Fixing
Review via email: mp+251766@code.qastaging.launchpad.net

Description of the change

This MR brings two camera tests and bunch of small fixes to CBT required to run them.

112aae9 .gitignore: ignore build-cbt
6ad7760 checkbox-touch: support qml-native jobs with no pagestack flow better
b5e0c4b checkbox-touch: make CBT fail the crashing qml-native jobs
3c3c395 checkbox:touch: teach qml front-end about session-dir
0d057ed plainbox:qml_shell: handle job's qml file loading errors
c7d0dfb providers:qml-tests: add camera-06 and camera07 tests
a34721d providers:qml-tests: 'vendorize' CameraApp module
b7a4a22 checkbox-touch: build-me now generates checkbox-touch.desktop
64af2f5 plainbox:data:qml-shell: handle qml jobs that couldn't be loaded
732cd0c plainbox:ctrl: add session_dir to data pushed to qml-shell
fe4fa5b plainbox:data:qml-shell: load test qml file properly

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

-1. we cannot merge anything with binary .so files for obvious reasons.

Please feel free to split this up to land bits and pieces that are not blocked by that.

review: Needs Fixing
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Removed Camera-07 test requiring Qt5.4.
Fixed session-dir.
Added tests for qml controller.
Fixed orientation.

Squashed, pushed.

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

For future desktop testing we'll also need to have qml-module-qtmultimedia as a dependency. Since we're not yet deb packaging the 2015.com.canonical.certification:qml-tests provider it's just a reminder.

I'll continue testing (so far blocked by vivid)

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

13:15 * zyga goes to review https://code.launchpad.net/~kissiel/checkbox/story-1241/+merge/251766
13:17 <@zyga> kissiel-lunch: http://bazaar.launchpad.net/~kissiel/checkbox/story-1241/revision/3600
13:17 <@zyga> kissiel-lunch: looks bogus
13:17 <@zyga> kissiel-lunch: can you check this
13:17 <@zyga> kissiel-lunch: thanks

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

This the log when running the camera06 test on vivid proposed (r31) on a nexus7: http://pastebin.ubuntu.com/10590333/

The screen goes white after the capture (I can hear the sensor shut down...) but no playback for me.

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

I built the app with: ./build-me --provider ../providers/2015.com.canonical.certification:qml-tests/

Revision history for this message
Maciej Kisielewski (kissiel) wrote :

> 13:15 * zyga goes to review
> https://code.launchpad.net/~kissiel/checkbox/story-1241/+merge/251766
> 13:17 <@zyga> kissiel-lunch:
> http://bazaar.launchpad.net/~kissiel/checkbox/story-1241/revision/3600
> 13:17 <@zyga> kissiel-lunch: looks bogus
> 13:17 <@zyga> kissiel-lunch: can you check this
> 13:17 <@zyga> kissiel-lunch: thanks

moved deletion to the patch that makes build-me generate it.

Revision history for this message
Maciej Kisielewski (kissiel) wrote :

> This the log when running the camera06 test on vivid proposed (r31) on a
> nexus7: http://pastebin.ubuntu.com/10590333/
>
> The screen goes white after the capture (I can hear the sensor shut down...)
> but no playback for me.

on 15.04 + flo it seems that actualLocation of videoRecorder is not properly set. Because we use absolute (and constant) path for the recording, we don't need to use actualLocation. In current state of the branch outputLocation is used.

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

tested with 15.04 + flo and your recent fix to use outputLocation, it works flawlessly.

+1

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