Merge lp:~michael-sheldon/ubuntu-keyboard/fix-autopilot-layout-contains-key into lp:ubuntu-keyboard

[Michael Sheldon]

Don't assume that we always have the same layout in autopilot emulator when caching key positions.

Don't assume that we always have the same layout in autopilot emulator when caching key positions.

[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 (ran keyboard tests and system settings 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, code changes are only in the autopilot emulator

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:397
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/623/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3478
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/124
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-armhf-ci/124/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-vivid-i386-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2896
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3475
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3475/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22145

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

review: Approve (continuous-integration)

[Ken VanDine (ken-vandine)]

I can confirm this fixes the keyboard layout changing issues we've been having with the ubuntu-system-settings autopilot tests.

review: Approve

=== modified file 'tests/autopilot/ubuntu_keyboard/emulators/keyboard.py'
--- tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-07-16 13:55:08 +0000
+++ tests/autopilot/ubuntu_keyboard/emulators/keyboard.py	2015-07-27 13:19:44 +0000
@@ -270,8 +270,9 @@
         self._show_keypad(keypad_name)
 
         contained, positions = self.active_keypad.get_key_details()
-        self._keys_contained[self._keyboard_container.state] = contained
-        self._keys_position[self._keyboard_container.state] = positions
+        layout_state = self.keyboard.layoutId + self._keyboard_container.state
+        self._keys_contained[layout_state] = contained
+        self._keys_position[layout_state] = positions
 
     def _keypad_contains_key(self, keypad_name, key):
         """Returns the keypad state that key is found in.
@@ -283,7 +284,8 @@
         if self._keypad_details_expired(keypad_name):
             self._update_details_for_keypad(keypad_name)
 
-        return self._keys_contained[keypad_name].get(key, None)
+        layout_state = self.keyboard.layoutId + keypad_name
+        return self._keys_contained[layout_state].get(key, None)
 
     def _get_key_pos_from_keypad(self, keypad_name, key):
         """Returns the position of the key if it is found on that keypad or
@@ -293,7 +295,8 @@
         if self._keypad_details_expired(keypad_name):
             self._update_details_for_keypad(keypad_name)
 
-        return self._keys_position[keypad_name].get(key, None)
+        layout_state = self.keyboard.layoutId + keypad_name
+        return self._keys_position[layout_state].get(key, None)
 
     def _show_keypad(self, keypad_name):
         if self._current_keypad_name == keypad_name:
@@ -352,8 +355,9 @@
             rate=2.77 * gu, time_between_events=2)
 
     def _keypad_details_expired(self, keypad_name):
+        layout_state = self.keyboard.layoutId + keypad_name
         return (
-            self._keys_contained.get(keypad_name) is None
+            self._keys_contained.get(layout_state) is None
         )
 
     def _translate_key(self, label):