Merge lp:~canonical-platform-qa/autopilot/create-keyboard-when-first-requested into lp:autopilot

Proposed by Christopher Lee
Status: Merged
Approved by: Christopher Lee
Approved revision: 568
Merged at revision: 569
Proposed branch: lp:~canonical-platform-qa/autopilot/create-keyboard-when-first-requested
Merge into: lp:autopilot
Diff against target: 21 lines (+3/-1)
1 file modified
autopilot/testcase.py (+3/-1)
To merge this branch: bzr merge lp:~canonical-platform-qa/autopilot/create-keyboard-when-first-requested
Reviewer Review Type Date Requested Status
Christopher Lee (community) Approve
Albert Astals Cid (community) has code of mine Abstain
PS Jenkins bot continuous-integration Approve
Review via email: mp+268423@code.launchpad.net

Commit message

Do not create a keyboard until first requested.

Description of the change

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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) :
review: Abstain (has code of mine)
Revision history for this message
Christopher Lee (veebers) wrote :

As mentioned this Alberts code that I grabbed here in an attempt to speed up the release.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/testcase.py'
2--- autopilot/testcase.py 2015-07-15 23:31:12 +0000
3+++ autopilot/testcase.py 2015-08-19 03:36:34 +0000
4@@ -163,7 +163,7 @@
5 self._process_manager = None
6 self._mouse = None
7 self._display = None
8- self._kb = Keyboard.create()
9+ self._kb = None
10
11 # Instatiate this after keyboard creation to ensure it doesn't get
12 # overwritten
13@@ -191,6 +191,8 @@
14
15 @property
16 def keyboard(self):
17+ if self._kb is None:
18+ self._kb = Keyboard.create()
19 return self._kb
20
21 @property

Subscribers

People subscribed via source and target branches