Merge lp:~osomon/notes-app/fix-pep8-warnings into lp:notes-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 195
Merged at revision: 202
Proposed branch: lp:~osomon/notes-app/fix-pep8-warnings
Merge into: lp:notes-app
Diff against target: 119 lines (+20/-14)
5 files modified
tests/autopilot/notes_app/tests/test_delete.py (+2/-1)
tests/autopilot/notes_app/tests/test_expand_collapse.py (+12/-10)
tests/autopilot/notes_app/tests/test_images.py (+2/-1)
tests/autopilot/notes_app/tests/test_parts.py (+2/-1)
tests/autopilot/notes_app/tests/test_quit.py (+2/-1)
To merge this branch: bzr merge lp:~osomon/notes-app/fix-pep8-warnings
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ugo Riboni (community) Approve
Review via email: mp+188523@code.launchpad.net

Commit message

Fix pep8 warnings.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

Code looks ok for me, so comment-approving until CI gets its stuff together.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/notes_app/tests/test_delete.py'
2--- tests/autopilot/notes_app/tests/test_delete.py 2013-07-29 20:53:21 +0000
3+++ tests/autopilot/notes_app/tests/test_delete.py 2013-10-01 07:45:21 +0000
4@@ -40,7 +40,8 @@
5 conn = sqlite3.connect(path)
6 cursor = conn.cursor()
7 cursor.execute("DELETE FROM notes")
8- cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')")
9+ cursor.execute("INSERT INTO notes (date, note) "
10+ "VALUES ('2013-04-07', '" + note_data + "')")
11 conn.commit()
12 conn.close()
13
14
15=== modified file 'tests/autopilot/notes_app/tests/test_expand_collapse.py'
16--- tests/autopilot/notes_app/tests/test_expand_collapse.py 2013-08-06 12:47:59 +0000
17+++ tests/autopilot/notes_app/tests/test_expand_collapse.py 2013-10-01 07:45:21 +0000
18@@ -46,7 +46,8 @@
19 cursor = conn.cursor()
20 cursor.execute("DELETE FROM notes")
21 for note in notes:
22- cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note + "')")
23+ cursor.execute("INSERT INTO notes (date, note) "
24+ "VALUES ('2013-04-07', '" + note + "')")
25 conn.commit()
26 conn.close()
27
28@@ -60,16 +61,17 @@
29 self.pointing_device.click_object(first)
30 self.assertThat(first.isExpanded, Eventually(Equals(True)))
31
32- # Here and in further tests we have to wait for height to equal actualExpandedHeight
33- # because that is the point when the expanding animation is finished and the note
34- # reaches its final expanded geometry. Just testing for isExpanded does not work
35- # as the property changes immediately and then the animation is triggered.
36- self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight)))
37+ # Here and in further tests we have to wait for height to equal
38+ # actualExpandedHeight because that is the point when the expanding
39+ # animation is finished and the note reaches its final expanded
40+ # geometry. Just testing for isExpanded does not work as the property
41+ # changes immediately and then the animation is triggered.
42+ first.height.wait_for(first.actualExpandedHeight)
43
44 self.pointing_device.click_object(second)
45 self.assertThat(first.isExpanded, Eventually(Equals(False)))
46 self.assertThat(second.isExpanded, Eventually(Equals(True)))
47- self.assertThat(second.height, Eventually(Equals(second.actualExpandedHeight)))
48+ second.height.wait_for(second.actualExpandedHeight)
49
50 self.pointing_device.click_object(first)
51 self.assertThat(first.isExpanded, Eventually(Equals(True)))
52@@ -81,7 +83,7 @@
53
54 self.pointing_device.click_object(first)
55 self.assertThat(first.isExpanded, Eventually(Equals(True)))
56- self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight)))
57+ first.height.wait_for(first.actualExpandedHeight)
58
59 self.pointing_device.click_object(header)
60 self.assertThat(first.isExpanded, Eventually(Equals(False)))
61@@ -92,7 +94,7 @@
62
63 self.pointing_device.click_object(first)
64 self.assertThat(first.isExpanded, Eventually(Equals(True)))
65- self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight)))
66+ first.height.wait_for(first.actualExpandedHeight)
67
68 # click in the empty space after all the notes
69 note_x, note_y, note_w, note_h = second.globalRect
70@@ -106,7 +108,7 @@
71
72 self.pointing_device.click_object(first)
73 self.assertThat(first.isExpanded, Eventually(Equals(True)))
74- self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight)))
75+ first.height.wait_for(first.actualExpandedHeight)
76
77 # click in the empty space between notes
78 note_x, note_y, note_w, note_h = first.globalRect
79
80=== modified file 'tests/autopilot/notes_app/tests/test_images.py'
81--- tests/autopilot/notes_app/tests/test_images.py 2013-09-26 17:55:31 +0000
82+++ tests/autopilot/notes_app/tests/test_images.py 2013-10-01 07:45:21 +0000
83@@ -37,7 +37,8 @@
84 conn = sqlite3.connect(path)
85 cursor = conn.cursor()
86 cursor.execute("DELETE FROM notes")
87- cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')")
88+ cursor.execute("INSERT INTO notes (date, note) "
89+ "VALUES ('2013-04-07', '" + note_data + "')")
90 conn.commit()
91 conn.close()
92
93
94=== modified file 'tests/autopilot/notes_app/tests/test_parts.py'
95--- tests/autopilot/notes_app/tests/test_parts.py 2013-07-29 20:53:21 +0000
96+++ tests/autopilot/notes_app/tests/test_parts.py 2013-10-01 07:45:21 +0000
97@@ -38,7 +38,8 @@
98 conn = sqlite3.connect(path)
99 cursor = conn.cursor()
100 cursor.execute("DELETE FROM notes")
101- cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')")
102+ cursor.execute("INSERT INTO notes (date, note) "
103+ "VALUES ('2013-04-07', '" + note_data + "')")
104 conn.commit()
105 conn.close()
106
107
108=== modified file 'tests/autopilot/notes_app/tests/test_quit.py'
109--- tests/autopilot/notes_app/tests/test_quit.py 2013-09-26 17:55:31 +0000
110+++ tests/autopilot/notes_app/tests/test_quit.py 2013-10-01 07:45:21 +0000
111@@ -76,7 +76,8 @@
112 conn = sqlite3.connect(path)
113 cursor = conn.cursor()
114 cursor.execute("DELETE FROM notes")
115- cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')")
116+ cursor.execute("INSERT INTO notes (date, note) "
117+ "VALUES ('2013-04-07', '" + note_data + "')")
118 conn.commit()
119 conn.close()
120

Subscribers

People subscribed via source and target branches