Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1436076 into lp:ubuntu-keyboard

Proposed by Michael Sheldon
Status: Merged
Approved by: Bill Filler
Approved revision: 345
Merged at revision: 345
Proposed branch: lp:~michael-sheldon/ubuntu-keyboard/fix-1436076
Merge into: lp:ubuntu-keyboard
Diff against target: 29 lines (+7/-1)
2 files modified
qml/Keyboard.qml (+1/-1)
tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py (+6/-0)
To merge this branch: bzr merge lp:~michael-sheldon/ubuntu-keyboard/fix-1436076
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+254289@code.launchpad.net

Commit message

Avoid reporting false visibility signal during startup

Description of the change

Avoid reporting false visibility signal during startup

To post a comment you must log in.
Revision history for this message
Michael Sheldon (michael-sheldon) wrote :

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

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?

 * Yes

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

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Keyboard.qml'
2--- qml/Keyboard.qml 2015-02-18 14:31:24 +0000
3+++ qml/Keyboard.qml 2015-03-26 17:17:51 +0000
4@@ -86,7 +86,7 @@
5 property bool extendedKeysShown: false
6
7 property bool firstShow: true
8- property bool hidingComplete: true
9+ property bool hidingComplete: false
10
11 property string layoutId: "freetext"
12
13
14=== modified file 'tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py'
15--- tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-03-16 13:06:42 +0000
16+++ tests/autopilot/ubuntu_keyboard/tests/test_keyboard.py 2015-03-26 17:17:51 +0000
17@@ -363,6 +363,12 @@
18 """The keyboard should only report visibility changes once.
19
20 """
21+
22+ # Test bug #1436076 which only occurs after maliit is restarted
23+ subprocess.check_call(['initctl', 'set-env', 'QT_LOAD_TESTABILITY=1'])
24+ subprocess.check_call(['restart', 'maliit-server'])
25+ sleep(10)
26+
27 qml = dedent("""
28 import QtQuick 2.0
29 import Ubuntu.Components 0.1

Subscribers

People subscribed via source and target branches