Merge lp:~azzar1/unity/fix-778499 into lp:unity
Proposed by
Andrea Azzarone
Status: | Merged |
---|---|
Approved by: | Marco Trevisan (Treviño) |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2335 |
Proposed branch: | lp:~azzar1/unity/fix-778499 |
Merge into: | lp:unity |
Diff against target: |
121 lines (+37/-3) 5 files modified
plugins/unityshell/src/AbstractLauncherIcon.h (+1/-0) plugins/unityshell/src/LauncherController.cpp (+6/-3) plugins/unityshell/src/LauncherIcon.cpp (+6/-0) tests/autopilot/autopilot/emulators/unity/launcher.py (+11/-0) tests/autopilot/autopilot/tests/test_launcher.py (+13/-0) |
To merge this branch: | bzr merge lp:~azzar1/unity/fix-778499 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marco Trevisan (Treviño) | Approve | ||
Review via email: mp+103327@code.launchpad.net |
Commit message
Set a shortcut for the new apps on the launcher too.
Description of the change
== Problem ==
New apps on the launcher have no shortcut key until something is being closed.
== Fix ==
Call LauncherControl
== Test ==
App test added.
./tools/autopilot run autopilot.
To post a comment you must log in.
Unity code looks good to me.
The test needs some tuning:
111 + desktop_file = self.KNOWN_ APPS['Calculato r']['desktop- file'] model.get_ icon_by_ desktop_ id(desktop_ file) != None: "Calculator icon is already on the launcher.") app('Calculator ') model.get_ icon_by_ desktop_ id(desktop_ file) (icon.shortcut, GreaterThan(0))
112 + if self.launcher.
113 + self.skip(
114 +
115 + self.start_
116 + icon = self.launcher.
117 + self.assertThat
Instead of skipping the test when the calculator is already opened, just close it and you can just do:
self.close_ all_app( 'Calculator' ) app('Calculator ') model.get_ icon_by_ desktop_ id(calc. desktop_ file) (icon.shortcut, Eventually( GreaterThan( 0)))
calc = self.start_
icon = self.launcher.
self.assertThat
(using eventually to avoid false-negatives)