gallery-app

Merge lp:~om26er/gallery-app/reduce_pep8_complaints into lp:gallery-app

  1. reduce_pep8_complaints
  2. Merge into trunk
Proposed by Omer Akram
Status: Superseded
Proposed branch: lp:~om26er/gallery-app/reduce_pep8_complaints
Merge into: lp:gallery-app
Diff against target: 88 lines (+16/-13)
4 files modified
tests/autopilot/gallery_app/emulators/album_editor.py (+1/-1)
tests/autopilot/gallery_app/emulators/album_view.py (+2/-2)
tests/autopilot/gallery_app/tests/__init__.py (+8/-5)
tests/autopilot/gallery_app/tests/test_album_editor.py (+5/-5)
To merge this branch: bzr merge lp:~om26er/gallery-app/reduce_pep8_complaints
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Omer Akram (community) Approve
Günter Schwann (community) Approve
Review via email: mp+165854@code.launchpad.net

This proposal has been superseded by a proposal from 2013-05-29.

Commit message

Fix a few pep8 complaints

Description of the change

Fixes a few pep8 complaints

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:675
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/180/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-ci/73
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-ci/167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1696

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/180/rebuild

review: Approve (continuous-integration)
Revision history for this message
Günter Schwann (schwann) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-autolanding/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/70
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-autolanding/70
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1724/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
Approved revid is not set in launchpad (maybe a permission problem?).
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-autolanding/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/71
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/71/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-autolanding/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1733

review: Needs Fixing (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

Self-approving for the autolanding job to run.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/82/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-amd64-autolanding/26
    None: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-armhf-autolanding/72/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-raring-i386-autolanding/72

review: Needs Fixing (continuous-integration)
Revision history for this message
Omer Akram (om26er) wrote :

oops, forgot the top-approve.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/gallery_app/emulators/album_editor.py'
2--- tests/autopilot/gallery_app/emulators/album_editor.py 2013-05-15 08:25:11 +0000
3+++ tests/autopilot/gallery_app/emulators/album_editor.py 2013-05-27 11:31:30 +0000
4@@ -52,5 +52,5 @@
5
6 def get_cover_menu_item(self, idx):
7 """Returns the item of the cover menu with index idx"""
8- return self.app.select_many("Standard",
9+ return self.app.select_many("Standard",
10 objectName="albumCoverMenuItem")[idx]
11
12=== modified file 'tests/autopilot/gallery_app/emulators/album_view.py'
13--- tests/autopilot/gallery_app/emulators/album_view.py 2013-05-23 11:22:48 +0000
14+++ tests/autopilot/gallery_app/emulators/album_view.py 2013-05-27 11:31:30 +0000
15@@ -29,8 +29,8 @@
16
17 def get_first_photo(self):
18 """Returns the first photo in a newly opened album"""
19- return self.app.select_many("FramePortrait",
20- visible=True, isLoaded=True)[0]
21+ return self.app.select_many(
22+ "FramePortrait", visible=True, isLoaded=True)[0]
23
24 def get_album_photo_view(self):
25 """Returns the photo view of the album viewer"""
26
27=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
28--- tests/autopilot/gallery_app/tests/__init__.py 2013-05-23 11:22:48 +0000
29+++ tests/autopilot/gallery_app/tests/__init__.py 2013-05-27 11:31:30 +0000
30@@ -83,15 +83,18 @@
31 sleep(1)
32
33 def launch_test_local(self):
34- self.app = self.launch_test_application(self.local_location,
35+ self.app = self.launch_test_application(
36+ self.local_location,
37 self.sample_dir)
38
39 def launch_test_installed(self):
40 if model() == 'Desktop':
41- self.app = self.launch_test_application("gallery-app",
42+ self.app = self.launch_test_application(
43+ "gallery-app",
44 self.sample_dir)
45 else:
46- self.app = self.launch_test_application("gallery-app",
47+ self.app = self.launch_test_application(
48+ "gallery-app",
49 "--desktop_file_hint=/usr/share/applications/gallery-app.desktop",
50 self.sample_dir,
51 app_type='qt')
52@@ -103,8 +106,8 @@
53 def click_item(self, item, delay=0.1):
54 """Does a mouse click on the passed item, and moved the mouse there
55 before"""
56- #In jenkins test may fail because we don't wait before clicking the target
57- #so we add a little delay before click.
58+ # In jenkins test may fail because we don't wait before clicking the
59+ # target so we add a little delay before click.
60 if model() == 'Desktop' and delay <= 0.25:
61 delay = 0.25
62
63
64=== modified file 'tests/autopilot/gallery_app/tests/test_album_editor.py'
65--- tests/autopilot/gallery_app/tests/test_album_editor.py 2013-05-23 11:22:48 +0000
66+++ tests/autopilot/gallery_app/tests/test_album_editor.py 2013-05-27 11:31:30 +0000
67@@ -150,16 +150,16 @@
68 def test_cover_image(self):
69 """Test to change the album cover image"""
70 cover_image = self.album_editor.get_album_cover_image()
71- self.assertThat(cover_image.source.endswith("album-cover-default-large.png"),
72- Equals(True))
73+ self.assertThat(
74+ cover_image.source.endswith("album-cover-default-large.png"), Equals(True))
75
76 # click somewhere rather at the bottom of the cover
77 x, y, w, h = cover_image.globalRect
78- self.pointing_device.move(x + int(w/2), y + h - int(h/10) )
79+ self.pointing_device.move(x + int(w / 2), y + h - int(h / 10))
80 self.pointing_device.click()
81
82 green_item = self.album_editor.get_cover_menu_item(2)
83 self.click_item(green_item)
84
85- self.assertThat(cover_image.source.endswith("album-cover-green-large.png"),
86- Equals(True))
87+ self.assertThat(
88+ cover_image.source.endswith("album-cover-green-large.png"), Equals(True))

Subscribers

People subscribed via source and target branches