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

[Steve Langasek]

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

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

[Nicholas Skaggs (nskaggs)]

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

[Olivier Tilloy (osomon)]

> 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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.70:8080/job/ubuntu-calendar-app-autolanding/91/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/892/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-raring-amd64-autolanding/91/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-saucy-amd64-autolanding/91/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-calendar-app-trusty-amd64-autolanding/31/console

review: Needs Fixing (continuous-integration)

[Nicholas Skaggs (nskaggs)]

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

review: Needs Fixing

[lp:~vorlon/ubuntu-calendar-app/proper-test-cleanup]

193. By Steve Langasek on 2014-01-31

pep8 cleanliness

Unmerged revisions

=== modified file 'tests/autopilot/calendar_app/tests/__init__.py'
--- tests/autopilot/calendar_app/tests/__init__.py	2014-01-28 15:31:31 +0000
+++ tests/autopilot/calendar_app/tests/__init__.py	2014-01-31 21:16:03 +0000
@@ -58,9 +58,7 @@
         #turn off the OSK so it doesn't block screen elements
         if model() != 'Desktop':
             os.system("stop maliit-server")
-            #adding cleanup step seems to restart service immeadiately
-            #disabling for now
-            #self.addCleanup(os.system("start maliit-server"))
+            self.addCleanup(os.system, "start maliit-server")
 
         # Unset the current locale to ensure locale-specific data
         # (day and month names, first day of the week, …) doesn’t get