Merge lp:~aacid/autopilot/keyboard_when_needed into lp:autopilot/1.5

Proposed by Albert Astals Cid
Status: Rejected
Rejected by: Christopher Lee
Proposed branch: lp:~aacid/autopilot/keyboard_when_needed
Merge into: lp:autopilot/1.5
Diff against target: 21 lines (+3/-1)
1 file modified
autopilot/testcase.py (+3/-1)
To merge this branch: bzr merge lp:~aacid/autopilot/keyboard_when_needed
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Autopilot Hackers Pending
Review via email: mp+268322@code.launchpad.net

Commit message

Do not create a keyboard until needed

Otherwise unity8 won't show the OSK because it thinks there's a physical keyboard attached.

To post a comment you must log in.
518. By Albert Astals Cid

Do not create a keyboard until needed

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Christopher Lee (veebers) wrote :

Hi Albert, Thanks for this. I'll take care of the CI failures (just pushing that branch now to fix flake8). Unfortunately we have a bit of a convoluted branch/release process where we develop (and merge into) on lp:autopilot and when we release using the train propose against lp:autopilot/1.5.

I can take these changes and put it through this process and deprecate this branch. Sorry for the confusion.

Revision history for this message
Christopher Lee (veebers) wrote :

Unmerged revisions

518. By Albert Astals Cid

Do not create a keyboard until needed

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'autopilot/testcase.py'
--- autopilot/testcase.py 2015-07-15 23:31:12 +0000
+++ autopilot/testcase.py 2015-08-18 12:45:18 +0000
@@ -163,7 +163,7 @@
163 self._process_manager = None163 self._process_manager = None
164 self._mouse = None164 self._mouse = None
165 self._display = None165 self._display = None
166 self._kb = Keyboard.create()166 self._kb = None
167167
168 # Instatiate this after keyboard creation to ensure it doesn't get168 # Instatiate this after keyboard creation to ensure it doesn't get
169 # overwritten169 # overwritten
@@ -191,6 +191,8 @@
191191
192 @property192 @property
193 def keyboard(self):193 def keyboard(self):
194 if self._kb is None:
195 self._kb = Keyboard.create()
194 return self._kb196 return self._kb
195197
196 @property198 @property

Subscribers

People subscribed via source and target branches