Merge lp:~michael-sheldon/ubuntu-keyboard/autopilot-reset into lp:ubuntu-keyboard

[Michael Sheldon]

Add reset function to autopilot emulator so that maliit can be reconnected after a unity8 restart.

Add reset function to autopilot emulator so that maliit can be reconnected after a unity8 restart.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:403
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/628/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3616
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/129
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/129/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/129
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2990
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3613
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3613/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22399

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/628/rebuild

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

Small comment but otherwise it works well

review: Needs Information

[Michael Sheldon (michael-sheldon)]

Responded inline

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:404
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/629/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3747/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3744/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/629/rebuild

review: Needs Fixing (continuous-integration)

[Brendan Donegan (brendan-donegan)]

There is some trailing whitespace according to Jenkins

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:405
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/630/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3750
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/131
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/131
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3097
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3747
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22618

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/630/rebuild

review: Needs Fixing (continuous-integration)

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes (tested against ubuntu-system-tests)

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * No (changes only provide an extra function for autopilot to use in other packages, with no effect on the keyboard's own behaviour)

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed UI labels, did you update the pot file?

 * No change

If you changed the packaging (debian), did you add a core-dev as a reviewer to this MP?

 * No change

[Brendan Donegan (brendan-donegan)]

Looks good now

review: Approve

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-07-28 12:01:12 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-08-18 11:38:07 +0000
@@ -211,6 +211,20 @@
             self.press_key(char)
             sleep(delay)
 
+    def reset(self):
+        """Reconnect to the maliit process. This should be called by any tests
+        which restart unity8 (thus causing the maliit-server process to also
+        be restarted).
+        """
+        Keyboard.__maliit = None
+        # self.maliit is a dynamic property (using the @property decorator),
+        # so this is actually a function call to the maliit() function,
+        # which triggers the maliit reconnection.
+        self.maliit
+        self._keyboard_container = self.keyboard.select_single(
+            "KeyboardContainer"
+        )
+
     @property
     def current_state(self):
         return self.keyboard.state
@@ -232,8 +246,8 @@
                 need_to_update = True
 
         if (
-            need_to_update
-            or self._stored_active_keypad_name != self._current_keypad_name
+            need_to_update or
+            self._stored_active_keypad_name != self._current_keypad_name
         ):
             self._stored_active_keypad_name = self._current_keypad_name
             logger.debug("Keypad lookup")