camera-app

Merge lp://qastaging/~fboucault/camera-app/fix_test_video_resolution into lp://qastaging/camera-app

  1. fix_test_video_resolution
  2. Merge into trunk
Proposed by Florian Boucault
Status: Superseded
Proposed branch: lp://qastaging/~fboucault/camera-app/fix_test_video_resolution
Merge into: lp://qastaging/camera-app
Diff against target: 768 lines (+418/-51)
10 files modified
BottomEdgeIndicators.qml (+1/-1)
CameraApp/advancedcamerasettings.cpp (+125/-0)
CameraApp/advancedcamerasettings.h (+11/-0)
OptionButton.qml (+1/-1)
ViewFinderOverlay.qml (+170/-4)
ViewFinderView.qml (+15/-16)
manifest.json.in (+1/-1)
tests/autopilot/camera_app/emulators/main_window.py (+20/-1)
tests/autopilot/camera_app/tests/test_capture.py (+27/-27)
tests/autopilot/camera_app/tests/test_zoom.py (+47/-0)
To merge this branch: bzr merge lp://qastaging/~fboucault/camera-app/fix_test_video_resolution
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+278981@code.qastaging.launchpad.net

Commit message

Fix AP test camera_app.tests.test_capture.TestCapture.test_video_resolution_setting_switching_cameras: use selected resolution from current camera as expected resolution.

To post a comment you must log in.

Unmerged revisions

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