camera-app

Merge lp:~fboucault/camera-app/ap_tests_pep8_fixes into lp:camera-app/staging

  1. ap_tests_pep8_fixes
  2. Merge into staging
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 617
Merged at revision: 617
Proposed branch: lp:~fboucault/camera-app/ap_tests_pep8_fixes
Merge into: lp:camera-app/staging
Diff against target: 25 lines (+2/-2)
2 files modified
tests/autopilot/camera_app/emulators/panel.py (+0/-1)
tests/autopilot/camera_app/tests/test_capture.py (+2/-1)
To merge this branch: bzr merge lp:~fboucault/camera-app/ap_tests_pep8_fixes
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+279080@code.launchpad.net

Commit message

AP tests: fix remaining 2 PEP8 failures.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/camera_app/emulators/panel.py'
2--- tests/autopilot/camera_app/emulators/panel.py 2015-11-26 13:09:47 +0000
3+++ tests/autopilot/camera_app/emulators/panel.py 2015-12-01 09:04:12 +0000
4@@ -6,7 +6,6 @@
5 # by the Free Software Foundation.
6
7 import logging
8-import sys
9
10 import ubuntuuitoolkit
11 from autopilot import logging as autopilot_logging
12
13=== modified file 'tests/autopilot/camera_app/tests/test_capture.py'
14--- tests/autopilot/camera_app/tests/test_capture.py 2015-11-30 14:51:38 +0000
15+++ tests/autopilot/camera_app/tests/test_capture.py 2015-12-01 09:04:12 +0000
16@@ -341,7 +341,8 @@
17 self.assertThat(
18 option_value_selector.visible, Eventually(Equals(True)))
19 optionButtons = option_value_selector.select_many("OptionValueButton")
20- resolutions = [button.label for button in optionButtons if button.selected]
21+ resolutions = [button.label for button in optionButtons
22+ if button.selected]
23
24 bottom_edge.close()
25 return resolutions[0]

Subscribers

People subscribed via source and target branches