Ubuntu Clock App

Merge lp:~nskaggs/ubuntu-clock-app/new-pep8-fixes into lp:ubuntu-clock-app/saucy

  1. new-pep8-fixes
  2. Merge into saucy
Proposed by Nicholas Skaggs
Status: Merged
Approved by: Nicholas Skaggs
Approved revision: 447
Merged at revision: 446
Proposed branch: lp:~nskaggs/ubuntu-clock-app/new-pep8-fixes
Merge into: lp:ubuntu-clock-app/saucy
Diff against target: 222 lines (+25/-9)
6 files modified
tests/autopilot/ubuntu_clock_app/emulators.py (+16/-5)
tests/autopilot/ubuntu_clock_app/tests/__init__.py (+2/-2)
tests/autopilot/ubuntu_clock_app/tests/test_alarm.py (+4/-2)
tests/autopilot/ubuntu_clock_app/tests/test_clock.py (+1/-0)
tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py (+1/-0)
tests/autopilot/ubuntu_clock_app/tests/test_timer.py (+1/-0)
To merge this branch: bzr merge lp:~nskaggs/ubuntu-clock-app/new-pep8-fixes
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Julia Palandri (community) Approve
Review via email: mp+224853@code.launchpad.net

Commit message

Fixes for new pep8 requirements

Description of the change

Fixes for new pep8 requirements

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:446
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/381/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/693
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/693/artifact/work/output/*zip*/output.zip
    FAILURE: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/28/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/381/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Julia Palandri (julia-palandri) wrote :

LGTM

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:446
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/382/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/710
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/710/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-clock-app-utopic-amd64-ci/29

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-clock-app-ci/382/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
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/ubuntu_clock_app/emulators.py'
2--- tests/autopilot/ubuntu_clock_app/emulators.py 2014-05-23 07:12:00 +0000
3+++ tests/autopilot/ubuntu_clock_app/emulators.py 2014-06-27 15:22:25 +0000
4@@ -30,6 +30,7 @@
5
6
7 class ClockEmulatorException(toolkit_emulators.ToolkitEmulatorException):
8+
9 """Exception raised when there is an error with the emulator."""
10
11
12@@ -76,10 +77,12 @@
13
14
15 class LabelDots(toolkit_emulators.TextField):
16+
17 """Autopilot helper for the LabelDots component."""
18
19
20 class Page(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
21+
22 """Autopilot helper for Pages."""
23
24 def __init__(self, *args):
25@@ -120,6 +123,7 @@
26
27
28 class ClockPage(Page):
29+
30 """Autopilot helper for the Clock page."""
31
32 def is_12_hour_time(self):
33@@ -242,6 +246,7 @@
34
35
36 class WorldClock(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
37+
38 """Autopilot helper for the World Clock Page"""
39
40 def click_world_city(self, index):
41@@ -256,6 +261,7 @@
42
43
44 class SettingsPage(object):
45+
46 """Autopilot helper for the Settings page."""
47
48 def __init__(self, proxy_object):
49@@ -290,6 +296,7 @@
50
51
52 class StopwatchPage(Page):
53+
54 """Autopilot helper for the Stopwatch page."""
55
56 def get_stopwatch_time(self):
57@@ -362,6 +369,7 @@
58
59
60 class AlarmPage(Page):
61+
62 """Autopilot helper for the Alarm page."""
63
64 def get_num_of_alarms(self):
65@@ -478,12 +486,12 @@
66 'Label', objectName='listAlarmSubtitle{}'.format(index)).text
67 # TODO we haven't implemented the alarm time check.
68 # --elopio - 2014-02-27
69- #time = self.select_single(
70+ # time = self.select_single(
71 # 'Label', objectName='listAlarmTime{}'.format(index)).text
72
73 # TODO: Check the alarm enabled status once the bug at
74 # http://pad.lv/1272337 is resolved
75- #enabled = self.select_single(
76+ # enabled = self.select_single(
77 # toolkit_emulators.CheckBox,
78 # objectName='listAlarmStatus{}'.format(index)).checked
79 alarms.append((name, recurrence))
80@@ -491,6 +499,7 @@
81
82
83 class AddAlarmPage(Page):
84+
85 """Autopilot helper for the Add Alarm page."""
86
87 @autopilot_logging.log_action(logger.info)
88@@ -614,6 +623,7 @@
89
90
91 class AlarmDays(toolkit_emulators.UbuntuUIToolkitEmulatorBase):
92+
93 """Autopilot helper for the Alarm Days dialog."""
94
95 @autopilot_logging.log_action(logger.info)
96@@ -657,6 +667,7 @@
97
98
99 class TimerPage(Page):
100+
101 """Autopilot helper for the Timer page."""
102
103 def get_num_of_presets(self):
104@@ -710,7 +721,7 @@
105
106 timeout = 0
107 timer_face = self.select_single('TimerFace')
108- #need to select clock in order to set time
109+ # need to select clock in order to set time
110 while not timer_face.focus and timeout < 10:
111 logger.debug('Timerlabel loop')
112 self._click_timer_label()
113@@ -720,7 +731,7 @@
114 # TODO we need a dialer hand emulator, with proper self-tests.
115 # --elopio -2014-01-31
116 minute = self._get_timer_minute_hand()
117- #make sure timer is set
118+ # make sure timer is set
119 x, y, w, h = minute.globalRect
120 tx = x + (w / 2)
121 ty = y + (h / 2.5)
122@@ -728,7 +739,7 @@
123 reset_button = self._get_timer_reset_button()
124 logger.debug('reset_button %s' % reset_button.visible)
125
126- #Try again if we failed at first
127+ # Try again if we failed at first
128 while not reset_button.visible and timeout < 10:
129 logger.debug('Dragging minute hand')
130 self.pointing_device.drag(
131
132=== modified file 'tests/autopilot/ubuntu_clock_app/tests/__init__.py'
133--- tests/autopilot/ubuntu_clock_app/tests/__init__.py 2014-02-27 21:29:18 +0000
134+++ tests/autopilot/ubuntu_clock_app/tests/__init__.py 2014-06-27 15:22:25 +0000
135@@ -52,11 +52,11 @@
136 super(ClockAppTestCase, self).setUp()
137 self.pointing_device = input.Pointer(self.input_device_class.create())
138
139- #backup and wipe db's before testing
140+ # backup and wipe db's before testing
141 self.temp_move_sqlite_db()
142 self.addCleanup(self.restore_sqlite_db)
143
144- #turn off the OSK so it doesn't block screen elements
145+ # turn off the OSK so it doesn't block screen elements
146 if model() != 'Desktop':
147 os.system("stop maliit-server")
148 self.addCleanup(os.system, "start maliit-server")
149
150=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_alarm.py'
151--- tests/autopilot/ubuntu_clock_app/tests/test_alarm.py 2014-05-19 15:11:41 +0000
152+++ tests/autopilot/ubuntu_clock_app/tests/test_alarm.py 2014-06-27 15:22:25 +0000
153@@ -30,6 +30,7 @@
154
155
156 class TestAlarm(ClockAppTestCase):
157+
158 """Tests the alarm page features"""
159
160 def setUp(self):
161@@ -62,7 +63,7 @@
162 expected_recurrence = 'Once on {}'.format(tomorrow.strftime('%a'))
163 # TODO: Check the alarm enabled status once the bug at
164 # http://pad.lv/1272337 is resolved
165- #expected_enabled_value = True
166+ # expected_enabled_value = True
167 expected_alarm_info = (
168 test_alarm_name, expected_recurrence)
169
170@@ -113,6 +114,7 @@
171
172
173 class TestRecurringAlarm(ClockAppTestCase):
174+
175 """Tests the recurring alarm creation"""
176
177 scenarios = [
178@@ -159,7 +161,7 @@
179 # XXX this will be affected by the locale. --elopio - 2014-02-27
180 # TODO: Check the alarm enabled status once the bug at
181 # http://pad.lv/1272337 is resolved
182- #expected_alarm_status = True
183+ # expected_alarm_status = True
184 expected_alarm_info = (
185 self.alarm_name, self.expected_recurrence)
186
187
188=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_clock.py'
189--- tests/autopilot/ubuntu_clock_app/tests/test_clock.py 2014-03-07 21:56:51 +0000
190+++ tests/autopilot/ubuntu_clock_app/tests/test_clock.py 2014-06-27 15:22:25 +0000
191@@ -30,6 +30,7 @@
192
193
194 class TestClock(ClockAppTestCase):
195+
196 """Test the clock page features."""
197
198 def setUp(self):
199
200=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py'
201--- tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py 2014-03-07 17:14:33 +0000
202+++ tests/autopilot/ubuntu_clock_app/tests/test_stopwatch.py 2014-06-27 15:22:25 +0000
203@@ -28,6 +28,7 @@
204
205
206 class TestStopwatch(ClockAppTestCase):
207+
208 """Tests the stopwatch page features"""
209
210 def setUp(self):
211
212=== modified file 'tests/autopilot/ubuntu_clock_app/tests/test_timer.py'
213--- tests/autopilot/ubuntu_clock_app/tests/test_timer.py 2014-03-06 23:24:54 +0000
214+++ tests/autopilot/ubuntu_clock_app/tests/test_timer.py 2014-06-27 15:22:25 +0000
215@@ -31,6 +31,7 @@
216
217
218 class TestTimer(ClockAppTestCase):
219+
220 """Tests the timer page features"""
221
222 def setUp(self):

Subscribers

People subscribed via source and target branches