Unity

Merge lp://qastaging/~3v1n0/unity/ap-launcher-authide-reveal into lp://qastaging/unity

ap-launcher-authide-reveal
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2012-04-19

Status:	Rejected
Rejected by:	Marco Trevisan (Treviño) on 2012-06-26
Proposed branch:	lp://qastaging/~3v1n0/unity/ap-launcher-authide-reveal
Merge into:	lp://qastaging/unity
Prerequisite:	lp://qastaging/~3v1n0/unity/quicklist-keynav-fixes
Diff against target:	54 lines (+16/-4) 1 file modified tests/autopilot/autopilot/emulators/unity/launcher.py (+16/-4)
To merge this branch:	bzr merge lp://qastaging/~3v1n0/unity/ap-launcher-authide-reveal
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
jenkins (community)	continuous-integration		Disapprove on 2012-06-25
Alex Launi (community)	quality		Needs Fixing on 2012-05-07
Thomi Richards		2012-04-19	Pending
Review via email: mp+102606@code.qastaging.launchpad.net

Commit message

autopilot, launcher emulator: don't try to reveal the launcher if not in auto-hide mode.

Description of the change

Reduce the duration of the autopilot tests that have to reveal the launcher (like clicking on icons), when the launcher is already always shown.

Revision history for this message

Thomi Richards (thomir-deactivatedaccount) wrote on 2012-04-19:

Several launcher autopilot tests fail with this branch. Can you fix please?

Revision history for this message

Alex Launi (alexlauni) wrote on 2012-05-07:

Tests that are only relevant when the launcher is in autohide mode should be grouped together in their own class. We should avoid doing things like returning in the test. This gives false positives on tests that don't actually run.

review: Needs Fixing (quality)

Revision history for this message

jenkins (martin-mrazik+qa) wrote on 2012-06-25:

FAILED: Continuous integration, rev:2293
http://s-jenkins:8080/job/unity-ci/12/

review: Disapprove (continuous-integration)

Revision history for this message

Martin Mrazik (mrazik) wrote on 2012-06-25:

It looks like there is a conflict:
+ bzr branch lp:unity work/trunk
Branched 2439 revisions.
+ cd work/trunk
+ bzr merge bzr+ssh://<email address hidden>/~3v1n0/unity/ap-launcher-authide-reveal
M tests/autopilot/unity/emulators/launcher.py
Text conflict in tests/autopilot/unity/emulators/launcher.py