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
1=== modified file 'autopilot/testcase.py'
2--- autopilot/testcase.py 2015-07-15 23:31:12 +0000
3+++ autopilot/testcase.py 2015-08-18 12:45:18 +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