Merge lp:~osomon/notes-app/fix-pep8-warnings into lp:notes-app
- fix-pep8-warnings
- Merge into trunk
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 |
Related bugs: |
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.
Description of the change
PS Jenkins bot (ps-jenkins) wrote : | # |
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
UNSTABLE: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
Ugo Riboni (uriboni) wrote : | # |
Code looks ok for me, so comment-approving until CI gets its stuff together.
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:195
http://
Executed test runs:
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:195
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Preview Diff
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 | 40 | conn = sqlite3.connect(path) | 40 | conn = sqlite3.connect(path) |
6 | 41 | cursor = conn.cursor() | 41 | cursor = conn.cursor() |
7 | 42 | cursor.execute("DELETE FROM notes") | 42 | cursor.execute("DELETE FROM notes") |
9 | 43 | cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')") | 43 | cursor.execute("INSERT INTO notes (date, note) " |
10 | 44 | "VALUES ('2013-04-07', '" + note_data + "')") | ||
11 | 44 | conn.commit() | 45 | conn.commit() |
12 | 45 | conn.close() | 46 | conn.close() |
13 | 46 | 47 | ||
14 | 47 | 48 | ||
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 | 46 | cursor = conn.cursor() | 46 | cursor = conn.cursor() |
20 | 47 | cursor.execute("DELETE FROM notes") | 47 | cursor.execute("DELETE FROM notes") |
21 | 48 | for note in notes: | 48 | for note in notes: |
23 | 49 | cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note + "')") | 49 | cursor.execute("INSERT INTO notes (date, note) " |
24 | 50 | "VALUES ('2013-04-07', '" + note + "')") | ||
25 | 50 | conn.commit() | 51 | conn.commit() |
26 | 51 | conn.close() | 52 | conn.close() |
27 | 52 | 53 | ||
28 | @@ -60,16 +61,17 @@ | |||
29 | 60 | self.pointing_device.click_object(first) | 61 | self.pointing_device.click_object(first) |
30 | 61 | self.assertThat(first.isExpanded, Eventually(Equals(True))) | 62 | self.assertThat(first.isExpanded, Eventually(Equals(True))) |
31 | 62 | 63 | ||
37 | 63 | # Here and in further tests we have to wait for height to equal actualExpandedHeight | 64 | # Here and in further tests we have to wait for height to equal |
38 | 64 | # because that is the point when the expanding animation is finished and the note | 65 | # actualExpandedHeight because that is the point when the expanding |
39 | 65 | # reaches its final expanded geometry. Just testing for isExpanded does not work | 66 | # animation is finished and the note reaches its final expanded |
40 | 66 | # as the property changes immediately and then the animation is triggered. | 67 | # geometry. Just testing for isExpanded does not work as the property |
41 | 67 | self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight))) | 68 | # changes immediately and then the animation is triggered. |
42 | 69 | first.height.wait_for(first.actualExpandedHeight) | ||
43 | 68 | 70 | ||
44 | 69 | self.pointing_device.click_object(second) | 71 | self.pointing_device.click_object(second) |
45 | 70 | self.assertThat(first.isExpanded, Eventually(Equals(False))) | 72 | self.assertThat(first.isExpanded, Eventually(Equals(False))) |
46 | 71 | self.assertThat(second.isExpanded, Eventually(Equals(True))) | 73 | self.assertThat(second.isExpanded, Eventually(Equals(True))) |
48 | 72 | self.assertThat(second.height, Eventually(Equals(second.actualExpandedHeight))) | 74 | second.height.wait_for(second.actualExpandedHeight) |
49 | 73 | 75 | ||
50 | 74 | self.pointing_device.click_object(first) | 76 | self.pointing_device.click_object(first) |
51 | 75 | self.assertThat(first.isExpanded, Eventually(Equals(True))) | 77 | self.assertThat(first.isExpanded, Eventually(Equals(True))) |
52 | @@ -81,7 +83,7 @@ | |||
53 | 81 | 83 | ||
54 | 82 | self.pointing_device.click_object(first) | 84 | self.pointing_device.click_object(first) |
55 | 83 | self.assertThat(first.isExpanded, Eventually(Equals(True))) | 85 | self.assertThat(first.isExpanded, Eventually(Equals(True))) |
57 | 84 | self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight))) | 86 | first.height.wait_for(first.actualExpandedHeight) |
58 | 85 | 87 | ||
59 | 86 | self.pointing_device.click_object(header) | 88 | self.pointing_device.click_object(header) |
60 | 87 | self.assertThat(first.isExpanded, Eventually(Equals(False))) | 89 | self.assertThat(first.isExpanded, Eventually(Equals(False))) |
61 | @@ -92,7 +94,7 @@ | |||
62 | 92 | 94 | ||
63 | 93 | self.pointing_device.click_object(first) | 95 | self.pointing_device.click_object(first) |
64 | 94 | self.assertThat(first.isExpanded, Eventually(Equals(True))) | 96 | self.assertThat(first.isExpanded, Eventually(Equals(True))) |
66 | 95 | self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight))) | 97 | first.height.wait_for(first.actualExpandedHeight) |
67 | 96 | 98 | ||
68 | 97 | # click in the empty space after all the notes | 99 | # click in the empty space after all the notes |
69 | 98 | note_x, note_y, note_w, note_h = second.globalRect | 100 | note_x, note_y, note_w, note_h = second.globalRect |
70 | @@ -106,7 +108,7 @@ | |||
71 | 106 | 108 | ||
72 | 107 | self.pointing_device.click_object(first) | 109 | self.pointing_device.click_object(first) |
73 | 108 | self.assertThat(first.isExpanded, Eventually(Equals(True))) | 110 | self.assertThat(first.isExpanded, Eventually(Equals(True))) |
75 | 109 | self.assertThat(first.height, Eventually(Equals(first.actualExpandedHeight))) | 111 | first.height.wait_for(first.actualExpandedHeight) |
76 | 110 | 112 | ||
77 | 111 | # click in the empty space between notes | 113 | # click in the empty space between notes |
78 | 112 | note_x, note_y, note_w, note_h = first.globalRect | 114 | note_x, note_y, note_w, note_h = first.globalRect |
79 | 113 | 115 | ||
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 | 37 | conn = sqlite3.connect(path) | 37 | conn = sqlite3.connect(path) |
85 | 38 | cursor = conn.cursor() | 38 | cursor = conn.cursor() |
86 | 39 | cursor.execute("DELETE FROM notes") | 39 | cursor.execute("DELETE FROM notes") |
88 | 40 | cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')") | 40 | cursor.execute("INSERT INTO notes (date, note) " |
89 | 41 | "VALUES ('2013-04-07', '" + note_data + "')") | ||
90 | 41 | conn.commit() | 42 | conn.commit() |
91 | 42 | conn.close() | 43 | conn.close() |
92 | 43 | 44 | ||
93 | 44 | 45 | ||
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 | 38 | conn = sqlite3.connect(path) | 38 | conn = sqlite3.connect(path) |
99 | 39 | cursor = conn.cursor() | 39 | cursor = conn.cursor() |
100 | 40 | cursor.execute("DELETE FROM notes") | 40 | cursor.execute("DELETE FROM notes") |
102 | 41 | cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')") | 41 | cursor.execute("INSERT INTO notes (date, note) " |
103 | 42 | "VALUES ('2013-04-07', '" + note_data + "')") | ||
104 | 42 | conn.commit() | 43 | conn.commit() |
105 | 43 | conn.close() | 44 | conn.close() |
106 | 44 | 45 | ||
107 | 45 | 46 | ||
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 | 76 | conn = sqlite3.connect(path) | 76 | conn = sqlite3.connect(path) |
113 | 77 | cursor = conn.cursor() | 77 | cursor = conn.cursor() |
114 | 78 | cursor.execute("DELETE FROM notes") | 78 | cursor.execute("DELETE FROM notes") |
116 | 79 | cursor.execute("INSERT INTO notes (date, note) VALUES ('2013-04-07', '" + note_data + "')") | 79 | cursor.execute("INSERT INTO notes (date, note) " |
117 | 80 | "VALUES ('2013-04-07', '" + note_data + "')") | ||
118 | 80 | conn.commit() | 81 | conn.commit() |
119 | 81 | conn.close() | 82 | conn.close() |
120 | 82 | 83 |
FAILED: Continuous integration, rev:195 jenkins. qa.ubuntu. com/job/ notes-app- ci/154/ jenkins. qa.ubuntu. com/job/ generic- mediumtests- saucy/4264 jenkins. qa.ubuntu. com/job/ generic- mediumtests- touch/1936 jenkins. qa.ubuntu. com/job/ notes-app- saucy-amd64- ci/49 jenkins. qa.ubuntu. com/job/ notes-app- saucy-armhf- ci/52 jenkins. qa.ubuntu. com/job/ notes-app- saucy-armhf- ci/52/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ notes-app- saucy-i386- ci/49 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-saucy/ 555 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-amd64/ 133 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-amd64/ 133/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 1939 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- saucy-armhf/ 1939/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- maguro/ 1631 jenkins. qa.ubuntu. com/job/ generic- mediumtests- runner- mako/1649
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
UNSTABLE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ notes-app- ci/154/ rebuild
http://