Merge lp:~canonical-platform-qa/address-book-app/remove-teardown-ap-tests into lp:address-book-app

[Christopher Lee]

Test now uses addCleanup to re-start the OSK.

Test now uses addCleanup to re-start the OSK.
I had an issue where the OSK wasn't started after a test which caused the following tests to fail when they tried to stop an already stopped service.

[lp:~canonical-platform-qa/address-book-app/remove-teardown-ap-tests]

430. By Christopher Lee on 2015-05-12

User a fixture instead.

431. By Christopher Lee on 2015-05-12

Oops, forgot to re-raise

[Leo Arias (elopio)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:429
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/802/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/105
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2722
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/897/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2720
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2720/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20386
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/712/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1077
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1077/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/802/rebuild

review: Needs Fixing (continuous-integration)

[Vincent Ladeuil (vila)]

See inline question.

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:431
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/803/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/106
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2724
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/898/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2351
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2722
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2722/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20389
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/713/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1078
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/1078/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/803/rebuild

review: Needs Fixing (continuous-integration)

[lp:~canonical-platform-qa/address-book-app/remove-teardown-ap-tests]

432. By Christopher Lee on 2015-05-14

Actuall log error message from command call

[Christopher Lee (veebers)]

> See inline question.
Good point, now logging better details.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:432
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/820/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-vivid-i386-ci/123
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2806
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2804
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2804/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20484

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/820/rebuild

review: Needs Fixing (continuous-integration)

[Federico Gimenez (fgimenez)]

LGTM

review: Approve

Unmerged revisions

432. By Christopher Lee on 2015-05-14

Actuall log error message from command call

431. By Christopher Lee on 2015-05-12

Oops, forgot to re-raise

430. By Christopher Lee on 2015-05-12

User a fixture instead.

429. By Christopher Lee on 2015-05-12

Remove need for tearDown using addCleanup

428. By Launchpad Translations on behalf of phablet-team on 2015-05-06

Launchpad automatic translations update.

427. By Launchpad Translations on behalf of phablet-team on 2015-05-03

Launchpad automatic translations update.

426. By Launchpad Translations on behalf of phablet-team on 2015-05-02

Launchpad automatic translations update.

=== modified file 'tests/autopilot/address_book_app/tests/__init__.py'
--- tests/autopilot/address_book_app/tests/__init__.py	2015-04-14 22:19:01 +0000
+++ tests/autopilot/address_book_app/tests/__init__.py	2015-05-14 04:42:25 +0000
@@ -16,6 +16,8 @@
 
 """address-book-app autopilot tests."""
 
+import fixtures
+import logging
 import os
 import time
 import subprocess
@@ -28,6 +30,30 @@
 import ubuntuuitoolkit
 from ubuntuuitoolkit import emulators as toolkit_emulators
 
+logger = logging.getLogger(__name__)
+
+
+class DisableOnScreenKeyboard(fixtures.Fixture):
+    """Disable the OSK for the time of the test (Does nothing on desktop)."""
+
+    def setUp(self):
+        super().setUp()
+        if model() != 'Desktop':
+            self.toggle_keyboard(state='stop')
+            self.addCleanup(self.toggle_keyboard, state='start')
+
+    def toggle_keyboard(self, state):
+        try:
+            subprocess.check_output(
+                ['/sbin/initctl', state, 'maliit-server'],
+                stderr=subprocess.STDOUT
+            )
+        except subprocess.CalledProcessError as e:
+            logger.error(
+                'Failed to toggle state of keyboard to: {state}\n'
+                'Error message: {msg}'.format(state=state, msg=e.output))
+            raise
+
 
 class AddressBookAppTestCase(AutopilotTestCase):
     """A common test case class that provides several useful methods for
@@ -45,9 +71,7 @@
         self.pointing_device = toolkit_emulators.get_pointing_device()
         super(AddressBookAppTestCase, self).setUp()
 
-        # stop vkb
-        if model() != "Desktop":
-            subprocess.check_call(["/sbin/initctl", "stop", "maliit-server"])
+        self.useFixture(DisableOnScreenKeyboard())
 
         if 'AUTOPILOT_APP' in os.environ:
             self.app_bin = os.environ['AUTOPILOT_APP']
@@ -86,13 +110,6 @@
         AddressBookAppTestCase.ARGS = []
         self.main_window.visible.wait_for(True)
 
-    def tearDown(self):
-        super(AddressBookAppTestCase, self).tearDown()
-
-        # start the vkb
-        if model() != "Desktop":
-            subprocess.check_call(["/sbin/initctl", "start", "maliit-server"])
-
     def launch_test_local(self):
         return self.launch_test_application(
             self.app_bin,