Merge lp:~vorlon/ubuntu-calendar-app/proper-test-cleanup into lp:ubuntu-calendar-app

Proposed by Steve Langasek
Status: Superseded
Proposed branch: lp:~vorlon/ubuntu-calendar-app/proper-test-cleanup
Merge into: lp:ubuntu-calendar-app
Diff against target: 14 lines (+1/-3)
1 file modified
tests/autopilot/calendar_app/tests/__init__.py (+1/-3)
To merge this branch: bzr merge lp:~vorlon/ubuntu-calendar-app/proper-test-cleanup
Reviewer Review Type Date Requested Status
Nicholas Skaggs (community) Needs Fixing
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Olivier Tilloy (community) Approve
Review via email: mp+204198@code.launchpad.net

This proposal has been superseded by a proposal from 2014-01-31.

Commit message

Re-enable maliit after the tests, by adding a proper cleanup handler

Description of the change

Re-enable maliit after the tests, by adding a proper cleanup handler

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

Steve, keep this bug in mind. You are correct that this will fix things, but I believe Olivier would rather see us not disabling the keyboard;

https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1268640

Revision history for this message
Olivier Tilloy (osomon) wrote :

> Steve, keep this bug in mind. You are correct that this will fix things, but I
> believe Olivier would rather see us not disabling the keyboard;
>
> https://bugs.launchpad.net/ubuntu-calendar-app/+bug/1268640

Yes, please. Let’s re-enable the OSK in tests.
Until that happens, this change looks good to me.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

pep8 strikes again.. Steve, be sure and run pep8 and pyflakes and submit again :-)

review: Needs Fixing
193. By Steve Langasek

pep8 cleanliness

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
2--- tests/autopilot/calendar_app/tests/__init__.py 2014-01-28 15:31:31 +0000
3+++ tests/autopilot/calendar_app/tests/__init__.py 2014-01-31 21:16:03 +0000
4@@ -58,9 +58,7 @@
5 #turn off the OSK so it doesn't block screen elements
6 if model() != 'Desktop':
7 os.system("stop maliit-server")
8- #adding cleanup step seems to restart service immeadiately
9- #disabling for now
10- #self.addCleanup(os.system("start maliit-server"))
11+ self.addCleanup(os.system, "start maliit-server")
12
13 # Unset the current locale to ensure locale-specific data
14 # (day and month names, first day of the week, …) doesn’t get

Subscribers

People subscribed via source and target branches

to status/vote changes: